Hotline 6.60

Patrick Barroca requested to merge hotline_6.60 into master

Merge request reports