Merge branch 'hotfix/1.22.5' into stable
1.22.6
Merge branch 'master' into hotfix/1.22.6
Merge branch 'hotfix/1.22.6'