Backport from !842

Merge request reports

Loading