Changes for Map Editor performance
Merge origin/master