6 Months Ago
merge from map_perf_improvements2