Merge branch 'fieldset-feature' into field-class-fix