added settings_overrides for maria and david
Merge branch 'master' into david-dev