Merge branch 'release-0.2.6' into develop
fix
Merge branch 'develop'