closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58828, closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61202
continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27779