Merge branch 'ts/alias-of-alias'