Merge branch 'hotfix-9.2.1'