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