CMS-1951 New ContentForm PoC
Added some support for FieldSet