Merge "Refactor to share map_info amongst threads."