Merge tag 'v3.6-rc3' into staging/for_v3.7