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