0.9.26
Merge branch 'release/0.9.26' into develop