Merge 3.6-rc3 into driver-core-next