EE-port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30286
part of https://gitlab.com/gitlab-org/gitlab-ce/issues/53811