Merge branch 'driver-refactoring' into new-driver-refactoring