Merge branch 'hotfix/branch-aliases'
s/alias/name/ in AbstractConsoleHandler
Merge branch 'hotfix/alias-to-name' into develop