Merge branch 'master' into develop
Build store yaml
Merge branch 'release/1.0.1'