Update to version v2.3.2
Merge branch 'release/2.3.2' into develop