Hotline 6.42

Laurent requested to merge hotline_6.42 into master

Merge request reports