Merge "set_maps: add back script and fix." into nextgenv2