Hotline 6.58

Ghislain Loas requested to merge hotline_6.58 into master

Merge request reports