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