config updateD
Merge branch 'dev'