Merge branch 'hotfix/0.9.26.1'
Merge branch 'develop' into hotfix/0.9.26.2
Squirrel 0.9.26.2 hotfix.
Merge branch 'hotfix/0.9.26.2' into develop