Fix ATReferenceFieldMarshaler; Add ZPTFieldMarshaler; Add support for marshalling multiple 'primary' fields