Merged RC2 Bugfixes also for release/4.3
Merge branch 'DDBNEXT-1147-hla-rc2bugs' into release/4.3