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