MBS-6149: don't mangle aliases on merge
Merge branch 'mbs-6149-merge-aliases-better' into beta

* mbs-6149-merge-aliases-better:
  MBS-6149: don't mangle aliases on merge