Merge pull request #8597 from ctiller/fieldsz

More data massaging