refs #7409. Implement fix to defaults.
Merge branch 'feature/7409_fix_defaults' into develop