WIP to trim starting spaces, refs #7130
Merge branch 'test' into dev