Merge branch 'hotfix/1.22.2' into stable
1.22.3
Merge branch 'master' into hotfix/1.22.3
Merge branch 'hotfix/1.22.3'