update settings file
Merge branch 'dev' into b2g
fix logic collapse