Merge branch 'hotfix/1.2.3' into develop
Merge branch 'release/1.2.4'