Merge latest from feature geomap