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