Merge tag 'v3.7-rc1' into staging/for_v3.8