Backport 6.0

Cédric Krierrequested to merge
topic/6.0/backport-6.0 into branch/6.0

Merge request reports