More tweaking of defaults
spacing
Merge branch 'rel-14.10' into next