Merge branch 'hotfix/1.2.2'
Update composer.json
Merge branch 'hotfix/1.2.3' into develop