MR: gitlab.com/gitlab-org/gitlab/-/merge_requests/61315 Issue: gitlab.com/gitlab-org/gitlab/-/issues/292833