Merge 3.18-rc4 into staging-next