Merge tag 'v3.3' into staging/for_v3.4