Add gen-mapped-aliases to setup procedure
Merge