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