Version/Changelog updated
Merge branch 'release/3.2.1' into develop