EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18503
Related issue https://gitlab.com/gitlab-org/gitlab-ce/issues/45590