Backport 7.4

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

Merge request reports