CE Backport of EE changes

What does this MR do?

CE backport of EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15632

Conformity

• [-] Changelog entry for user-facing changes, or community contribution. Check the link for other scenarios.
• [-] 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

Quality ~backstage