What does this MR do?
This is another approach to gitlab-org/gitlab-ce!14178.
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary - Tests
- [-] Added for this feature/bug
-
All builds are passing
-
Conform by the style guides -
Branch has no merge conflicts with master(if it does - rebase it please) -
Squashed related commits together