Fix RT #92431
Merge branch 'hotfix/rt92431'