refs #10233. Add new setting and switch.
Merge remote-tracking branch 'origin/feature/10233_defaults'