Release cleanup
Merge branch 'release/0.2.26' into develop