Modify configuration files
Merge branch 'dev'