first shot, just with smoke test
Merge branch 'add-general-maps-and-aliases'