Backport of EE MR
What does this MR do?
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14320.
Does this MR meet the acceptance criteria?
Conformity
Edited by Walmyr Lima e Silva Filho
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14320.