Merge "Copy less when active map is in use"