Merge 3.9-rc3 into staging-next