settings.js refactoring
performance improvement
refactoring
Merge remote-tracking branch 'origin/master'