Geomap: Merging feature-geomap-clean branch into v4.0