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