first half for untrimmed tags, refs #6558
fix for ken, apparently i can't grammer today
Merge branch 'dev' into test