Merge branch 'hotfix/1.26.4' into stable
1.26.5
Merge branch 'master' into hotfix/1.26.5
Merge branch 'hotfix/1.26.5'