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