Fixes #7277, map adjustments

Fixes #7277, and includes some map changes and fixes from PR #7249.
Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze-map
Merge pull request #7328 from mwerezak/dev-freeze-map

Fixes #7277, map adjustments