Merge tag '1.2.3' into develop

Release v1.2.3
Merge branch 'master' into develop
Merge branch 'release/1.2.4'