Merge branch 'hotfix/1.26.6' into stable
1.26.7
Merge branch 'master' into hotfix/1.26.7
Merge branch 'hotfix/1.26.7'