DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants
DDBNEXT-981: Refactoring Constants
Merge branch 'DDBNEXT-981-hla-refaconst' into develop