Merge remote-tracking branch 'driver-core/driver-core-next'