Merge branch 'hotfix/1.7.1'
Update composer.json
Merge branch 'hotfix/1.7.2' into develop