Merge branch 'hotfix/v0.2.5'
bundle update related changes
update CHANGELOG
bump version 0.2.6
Merge branch 'hotfix/v0.2.6' into develop