Hotline 6.47

Ghislain Loas requested to merge hotline_6.47 into WIP

Merge request reports