cherry-pick !6250

Merge request reports

Loading