Part of https://gitlab.com/gitlab-org/gitlab-ee/issues/6118
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19563