Ports changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/642 back into CE