Backport from !730

Merge request reports

Loading