Merge 4.5-rc4 into driver-core-next