Merge Request: gitlab.com/gitlab-org/gitlab/-/merge_requests/40729
Issue: gitlab.com/gitlab-org/gitlab/-/issues/241466