Merge tag '2.3.2' into develop

Version 2.3.2
Make sure, the client will not be downgraded.
Merge branch 'release/2.3.3'