UPDATED: FormScaffolder behaviour for polymorphic fields