* Cherry-pick commit (2d5afb36c7) Co-authored-by: Gildor <521036+Jildor@users.noreply.github.com>
2d5afb36c7