DRIVERS-2549: See DRIVERS-2637, DRIVERS-2630, and DRIVERS-2632
This ticket was split from DRIVERS-2549, please see that ticket for a detailed description.