60 Days Ago
merge from map_markers_fix