Merge 3.7-rc5 into driver-core-next