Hotline 6.48

Patrick Barroca requested to merge hotline_6.48 into master

Merge request reports