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

Added map changes from #3226 to 2.1.3