Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6665
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20165