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