Merge tag 'v3.4-rc3' into staging/for_v3.5