Merge 6.2-rc5 into driver-core-next