Manual merge of GitLab upstream, step 8

Merge request reports

Loading