ee MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11032
closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10012