backport master hl file updates

Merged Christoph Cullmann requested to merge work/backport_hl_files into kf5

backport master hl file updates

Merge request reports