Mirroring changes to driver made in Release 2.0 Dev Branch.