Merge 4.6-rc4 into driver-core-next