Updated settings
Merge branch 'v7'