CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7256 See merge request gitlab-org/gitlab-ce!21545