DDBNEXT-1035: Map
Merge branch 'DDBNEXT-1035-hla-map6' into develop