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