EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10729
ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/29219