DDBNEXT-935: Namespace problems
DDBNEXT-935: Namespace problems
DDBNEXT-935: Namespace problems
Merge branch 'DDBNEXT-935-hla-namespace' into develop