Merge 3.8-rc5 into driver-core-next