Merge 3.9-rc4 into driver-core-next