4825ec70b1
* Move add_manual_fields call to make_schema_definition * Do not call add_manual_fields twice
* Move add_manual_fields call to make_schema_definition * Do not call add_manual_fields twice