Hotline 6.40

Laurent requested to merge hotline_6.40 into master

Merge request reports