Merge 4.2-rc3 into staging-next