HotFix for Map creation.
Merge remote-tracking branch 'origin/master' into Interface