Merge 4.7-rc6 into staging-next