Use plus operator to compute merged settings
Merge branch 'settings' into v3