cherry-pick !5703

Merge request reports

Loading