Backport some changes from gitlab-ee!5476
What does this MR do?
Are there points in the code the reviewer needs to double check?
Why was this MR needed?
To backport the mentioned changes and to satisfy the branch name format required by https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5476
Screenshots (if relevant)
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Documentation created/updated -
API support added -
Tests added for this feature/bug - Review
-
Has been reviewed by UX -
Has been reviewed by Frontend -
Has been reviewed by Backend -
Has been reviewed by Database
-
-
Conform by the merge request performance guides -
Conform by the style guides -
Squashed related commits together -
Internationalization required/considered -
End-to-end tests pass ( package-and-qamanual pipeline job)