don't duplicate some settings
Merge branch 'hotfix/1.1.1'