closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57226
continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27526