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