Necessaries for v3.2.1 release
Merge branch 'release/v321' into develop