Backport 5.0

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

Merge request reports