Manual merge of GitLab upstream, step 6

Merge request reports

Loading