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