Hotline 6.50

Patrick Barroca requested to merge hotline_6.50 into master

Merge request reports