Merge branch 'hotfix/1.20.11' into stable
1.20.12
Merge branch 'master' into hotfix/1.20.12
Merge branch 'hotfix/1.20.12'