Manual merge of GitLab upstream, step 10

Merge request reports

Loading