Merge branch 'DDBNEXT-1018-hla-advancedfacet' into release/4.2
Merge branch 'release/4.2' into develop