Merge v3.5-rc5 into driver-core-next