Backport code from gitlab-ee!6182
What does this MR do?
Backport code from gitlab-ee!6182 which makes it easier to shrink the mismatch between CE/EE.
Does this MR meet the acceptance criteria?
- Conform by the code review guidelines
-
Has been reviewed by a Backend maintainer -
Has been reviewed by a Database specialist
-
-
Conform by the merge request performance guides -
Conform by the style guides -
If you have multiple commits, please combine them into a few logically organized commits by squashing them -
Internationalization required/considered -
End-to-end tests pass ( package-and-qamanual pipeline job)
What are the relevant issue numbers?
Edited by Rémy Coutable