Merge "Speed up map creation."