Fix RT #92456
Merge branch 'hotfix/rt92456'