Merge tag '2.3' into develop

Version 2.3
Merge branch 'master' into develop
Merge hotfix from 'master' into develop.
Upgrade the composer-client version, if necessary.
Merge branch 'release/2.3.2'