Bug choose maps

hiendc requested to merge bug/choose-maps into uat

Merge request reports