MR: gitlab.com/gitlab-org/gitlab/-/merge_requests/69879
Issue: gitlab.com/gitlab-org/gitlab/-/issues/339513

Changelog: added