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

Changelog: other