Merge "Turn ActiveMapTest back on." into nextgenv2