Merge 3.3-rc6 into driver-core-next