MR: gitlab.com/gitlab-org/gitlab/-/merge_requests/51098 Issue: gitlab.com/gitlab-org/gitlab/-/issues/292822
