Hotline 6.54

Laurent requested to merge hotline_6.54 into WIP

Merge request reports