Merge 3.10-rc7 into driver-core-next