Add initial UNTEST code for customField support
Fix CustomField class
Merge branch 'feature/composer-custom' into feature/composer

* feature/composer-custom:
  Fix CustomField class
  Add initial UNTEST code for customField support