DDBNEXT-1229: Refactoring map
Merge branch 'DDBNEXT-1229-hla-newmap1' into develop