Remove store from YML
Merge branch 'dev'