Backport of EE changes from MR !13763
What does this MR do?
Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763
Does this MR meet the acceptance criteria?
Conformity
Edited by Rémy Coutable
Backport https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763