Merge 4.3-rc7 into staging-next