MapFixes
Addition
Merge pull request #3399 from Steelpoint/MapChanges

[MAP] Several fixes + Minor additions