Merge branch 'hotfix/rt92456'
Merge branch 'develop'
Fixed merge