Merge 6.0-rc4 into staging-next