Merge branch 'hotfix/1.21.8' into stable
1.21.9
Merge branch 'master' into hotfix/1.21.9
Merge branch 'hotfix/1.21.9'