Update config
Merge branch 'release/mvp_1'