Merge branch 'hotfix/composer-alias'
Added missing return
Merge branch 'hotfix/3611' into develop

Forward port #3611