MR: gitlab.com/gitlab-org/gitlab/-/merge_requests/83940
Issue: gitlab.com/gitlab-org/gitlab/-/issues/354853

Changelog: other