Merge 5.6-rc5 into driver-core-next