Merge 3.7-rc6 into staging-next