Merge tag 'staging-3.3-rc3' into staging-next