ManageMapTest
Merge remote-tracking branch 'origin/Evgenii' into Evgenii