part of https://gitlab.com/gitlab-org/gitlab-ce/issues/53811
CE-backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14644