Merge branch 'hotfix/1.21.5' into stable
1.21.6
Merge branch 'master' into hotfix/1.21.6
Merge branch 'hotfix/1.21.6'