Merge branch 'release-0.1.1' into develop
appearantly the to-merge plugin behaviors is still old format
Merge branch 'release-0.1.2'