Merge 3.11-rc3 into driver-core-next