EE Backport to CE of EE!12404
What does this MR do?
EE Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12404 as part of the single codebase project.
Edited by Liam McAndrew
EE Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12404 as part of the single codebase project.