refs #7409. Implement fix to defaults.
Merge remote-tracking branch 'origin/feature/7409_fix_defaults'