Merge 4.6-rc3 into staging-next