Merge 3.2-rc5 into staging-next