Bugfixes: DDBNEXT-717, DDBNEXT-718
Merge branch 'DDBNEXT-718-hla-tooltip' into develop