Hotline master

Merged Patrick Barroca requested to merge hotline-master into master

Merge request reports