Merge Request: gitlab.com/gitlab-org/gitlab/-/merge_requests/40391
Issue: gitlab.com/gitlab-org/gitlab/-/issues/225555