Merge "Changes made to default settings in Wizard not reflected in error report"