Following !5746 (merged), backport a change from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/637/diffs#diff-2.
Does this MR meet the acceptance criteria?
-
CHANGELOG entry added - Tests
-
All builds are passing
-
-
Conform by the style guides -
Branch has no merge conflicts with master(if you do - rebase it please) -
Squashed related commits together