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