Alias is compatible with Hub
Merge branch 'alias_compat'