Settings fix

Merged Carl Schaffer requested to merge settings_fix into master

Merge request reports