Backport from !738

Merge request reports

Loading