Merge branch 'master' into develop
Remove console log on vp update
Merge branch 'release/0.2.6'