Merge 3.13-rc2 into driver-core-next