Regenerated feature-geomap branch with latest code from WET core