Merge branch 'hotfix/1.26.1' into stable
1.26.2
Merge branch 'master' into hotfix/1.26.2
Merge branch 'hotfix/1.26.2'