Bugfixes DDBNEXT-684 and DDBNEXT-685
Merge branch 'DDBNEXT-684-hla-instdisplay' into develop