* cherry-pick from (4b028e599e) Co-Authored-By: offl <11556157+offl@users.noreply.github.com>
4b028e599e