Merge tag 'v3.9-rc1' into staging/for_v3.9