Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/945 and https://gitlab.com/gitlab-org/gitlab-ce/issues/22185