Merge branch 'hotfix/rt92431'
Fix RT #92456
Merge branch 'hotfix/rt92456' into develop