Bump version
Merge branch 'release/3.2.1' into dev