Merge branch 'hotfix/composer-branch-alias'

Update composer branch aliases
fix typo
Merge pull request #5958
Merge pull request #5958 in develop