Backport of !925

Merge request reports

Loading