Add deva config
Add deva config
Merge branch 'master' into dev