Fixes https://gitlab.com/gitlab-org/gitlab/-/issues/249176 Fixes https://gitlab.com/gitlab-org/gitlab/-/issues/254622
