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

• [-] Changelog entry
• [-] Documentation created/updated or follow-up review issue created
• Code review guidelines
• [-] Merge request performance guidelines
• Style guides
• [-] Database guides
• [-] Separation of EE specific content