Fix hl

Laurent requested to merge fix-hl into master

Merge request reports