Backport

Cédric Krierrequested to merge
topic/6.6/backport into branch/6.6

Merge request reports