Merge branch 'release/1.3.1' into develop
WIP
Bump version 1.3.2
Merge branch 'release/1.3.2'