Issue: gitlab.com/gitlab-org/gitlab/-/issues/354091
MR: gitlab.com/gitlab-org/gitlab/-/merge_requests/82248

Changelog: added