Tweaking  setting name
Merge branch 'develop'