Added map changes from #3226 to 2.1.3
Merge pull request #3335 from Giacom/ikky_why

[MAP] Re-adds missing map changes from 2.1.2.