Merge change 3586

* changes:
  Adds BaseTypes interface so that a general TYPE_CUSTOM field is available.