configure build setting
Merge branch 'dev'