EE-Port of gitlab-ce!20513

What does this MR do?

See gitlab-ce!20513

Does this MR meet the acceptance criteria?

• Conform by the code review guidelines
  • Has been reviewed by a Frontend maintainer

What are the relevant issue numbers?

• https://gitlab.com/gitlab-org/gitlab-ce/issues/44912
• https://gitlab.com/gitlab-org/gitlab-ce/issues/44919
• https://gitlab.com/gitlab-org/gitlab-ce/issues/44920