Hotline 6.50

Ghislain Loas requested to merge hotline_6.50 into master

Merge request reports