Merge tag 'v3.2.1' into develop

Corrections
Merge remote-tracking branch 'origin/master' into develop