CE backport for changes in EE MR 14746
What does this MR do?
This is an update to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14746 for all the files that are available to EE as well as CE.
Does this MR meet the acceptance criteria?
Conformity
Edited by Tomislav Nikić