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