Merge branch 'release/0.2.6'
Merge branch 'release/0.2.7'
Merge branch 'master' into develop