Merge branch 'hotfix/1.20.5' into stable
1.20.6
Merge branch 'master' into hotfix/1.20.6
Merge branch 'hotfix/1.20.6'