Merge 3.7-rc3 into driver-core-next