Merge 4.2-rc4 into staging-next