[TASK] ADWD 1031 Map optimizations
Merge pull request #27 from subugoe/feature/ADWD-1031

Try to fix merge conflicts