Added refresh method to the map.
Merge branch 'release-3.0-cleanup' into release-3.0-integration