DDBNEXT-159: Regex can cause problems
Merge branch 'DDBNEXT-159-hla-regexproblems' into develop