Hotline Jgaimard

Ghost User requested to merge hotline-jgaimard into hotline_6.40

Work from previous week

Merge request reports