Merge branch 'hotfix/1.21.11' into stable
1.21.12
Merge branch 'master' into hotfix/1.21.12
Merge branch 'hotfix/1.21.12'