add new setting
Merge branch 'develop'