refs #10233. Add new setting and switch.
Merge branch 'feature/10233_defaults' into develop