1.20 backport of !356

Merge request reports