Backport changes from gitlab-ee!7538
What does this MR do?
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7538
What are the relevant issue numbers?
Does this MR meet the acceptance criteria?
-
Tests added for this feature/bug -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides