Backport to resolve conflicts for gitlab-ee!9224
What does this MR do?
backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9224/diffs
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated via this MR -
Documentation reviewed by technical writer or follow-up review issue created -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides