This ticket was split from DRIVERS-1788, please see that ticket for a detailed description.
As part of this ticket, include the changes from DRIVERS-2027 as well.
This ticket was split from DRIVERS-1788, please see that ticket for a detailed description.
As part of this ticket, include the changes from DRIVERS-2027 as well.