Handle deterministic marshaling for generated marshalers in XXX_Marshal

* dev: generator.go: corrected handling of deterministic parameter

* dev: table_marshal.go - merged in handling of deterministic flag from golang/protobuf

* dev: added tests for deterministic marshaling

* dev: added tests for errors in deterministic marshaling

* dev: reverted to proto2 syntax

* govet

* fixed proto2 syntax mistake

* fixed proto2 syntax mistake
diff --git a/Makefile b/Makefile
index 51aa799..f07eaa6 100644
--- a/Makefile
+++ b/Makefile
@@ -120,6 +120,7 @@
 	make -C test/importcustom-issue389 regenerate
 	make -C test/merge regenerate
 	make -C test/cachedsize regenerate
+	make -C test/deterministic regenerate
 	make gofmt
 
 tests:
diff --git a/proto/all_test.go b/proto/all_test.go
index a7bc594..bdb08f2 100644
--- a/proto/all_test.go
+++ b/proto/all_test.go
@@ -2264,6 +2264,17 @@
 	}
 }
 
+func TestDeterministicErrorOnCustomMarshaler(t *testing.T) {
+	u := uint64(0)
+	in := &CustomDeterministicMarshaler{Field1: &u}
+	var b1 Buffer
+	b1.SetDeterministic(true)
+	err := b1.Marshal(in)
+	if !strings.Contains(err.Error(), "deterministic") {
+		t.Fatalf("Expected: %s but got %s", "proto: deterministic not supported by the Marshal method of test_proto.CustomDeterministicMarshaler", err.Error())
+	}
+}
+
 // Benchmarks
 
 func testMsg() *GoTest {
diff --git a/proto/table_marshal.go b/proto/table_marshal.go
index 79af991..255e7b5 100644
--- a/proto/table_marshal.go
+++ b/proto/table_marshal.go
@@ -246,6 +246,9 @@
 	// If the message can marshal itself, let it do it, for compatibility.
 	// NOTE: This is not efficient.
 	if u.hasmarshaler {
+		if deterministic {
+			return nil, errors.New("proto: deterministic not supported by the Marshal method of " + u.typ.String())
+		}
 		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
 		b1, err := m.Marshal()
 		b = append(b, b1...)
diff --git a/proto/test_proto/deterministic.go b/proto/test_proto/deterministic.go
new file mode 100644
index 0000000..6c9f568
--- /dev/null
+++ b/proto/test_proto/deterministic.go
@@ -0,0 +1,5 @@
+package test_proto
+
+func (m *CustomDeterministicMarshaler) Marshal() ([]byte, error) {
+	return []byte{}, nil
+}
diff --git a/proto/test_proto/test.pb.go b/proto/test_proto/test.pb.go
index 1db1e33..a1dd3d8 100644
--- a/proto/test_proto/test.pb.go
+++ b/proto/test_proto/test.pb.go
@@ -48,7 +48,7 @@
 	return nil
 }
 func (FOO) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{0}
+	return fileDescriptor_test_800cb821a123159d, []int{0}
 }
 
 // An enum, for completeness.
@@ -122,7 +122,7 @@
 	return nil
 }
 func (GoTest_KIND) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{2, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{2, 0}
 }
 
 type MyMessage_Color int32
@@ -161,7 +161,7 @@
 	return nil
 }
 func (MyMessage_Color) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{13, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{13, 0}
 }
 
 type DefaultsMessage_DefaultsEnum int32
@@ -200,7 +200,7 @@
 	return nil
 }
 func (DefaultsMessage_DefaultsEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{16, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{16, 0}
 }
 
 type Defaults_Color int32
@@ -239,7 +239,7 @@
 	return nil
 }
 func (Defaults_Color) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{21, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{21, 0}
 }
 
 type RepeatedEnum_Color int32
@@ -272,7 +272,7 @@
 	return nil
 }
 func (RepeatedEnum_Color) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{23, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{23, 0}
 }
 
 type GoEnum struct {
@@ -286,7 +286,7 @@
 func (m *GoEnum) String() string { return proto.CompactTextString(m) }
 func (*GoEnum) ProtoMessage()    {}
 func (*GoEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{0}
+	return fileDescriptor_test_800cb821a123159d, []int{0}
 }
 func (m *GoEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoEnum.Unmarshal(m, b)
@@ -325,7 +325,7 @@
 func (m *GoTestField) String() string { return proto.CompactTextString(m) }
 func (*GoTestField) ProtoMessage()    {}
 func (*GoTestField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{1}
+	return fileDescriptor_test_800cb821a123159d, []int{1}
 }
 func (m *GoTestField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTestField.Unmarshal(m, b)
@@ -458,7 +458,7 @@
 func (m *GoTest) String() string { return proto.CompactTextString(m) }
 func (*GoTest) ProtoMessage()    {}
 func (*GoTest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{2}
+	return fileDescriptor_test_800cb821a123159d, []int{2}
 }
 func (m *GoTest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTest.Unmarshal(m, b)
@@ -1082,7 +1082,7 @@
 func (m *GoTest_RequiredGroup) String() string { return proto.CompactTextString(m) }
 func (*GoTest_RequiredGroup) ProtoMessage()    {}
 func (*GoTest_RequiredGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{2, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{2, 0}
 }
 func (m *GoTest_RequiredGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTest_RequiredGroup.Unmarshal(m, b)
@@ -1120,7 +1120,7 @@
 func (m *GoTest_RepeatedGroup) String() string { return proto.CompactTextString(m) }
 func (*GoTest_RepeatedGroup) ProtoMessage()    {}
 func (*GoTest_RepeatedGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{2, 1}
+	return fileDescriptor_test_800cb821a123159d, []int{2, 1}
 }
 func (m *GoTest_RepeatedGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTest_RepeatedGroup.Unmarshal(m, b)
@@ -1158,7 +1158,7 @@
 func (m *GoTest_OptionalGroup) String() string { return proto.CompactTextString(m) }
 func (*GoTest_OptionalGroup) ProtoMessage()    {}
 func (*GoTest_OptionalGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{2, 2}
+	return fileDescriptor_test_800cb821a123159d, []int{2, 2}
 }
 func (m *GoTest_OptionalGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTest_OptionalGroup.Unmarshal(m, b)
@@ -1197,7 +1197,7 @@
 func (m *GoTestRequiredGroupField) String() string { return proto.CompactTextString(m) }
 func (*GoTestRequiredGroupField) ProtoMessage()    {}
 func (*GoTestRequiredGroupField) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{3}
+	return fileDescriptor_test_800cb821a123159d, []int{3}
 }
 func (m *GoTestRequiredGroupField) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTestRequiredGroupField.Unmarshal(m, b)
@@ -1235,7 +1235,7 @@
 func (m *GoTestRequiredGroupField_Group) String() string { return proto.CompactTextString(m) }
 func (*GoTestRequiredGroupField_Group) ProtoMessage()    {}
 func (*GoTestRequiredGroupField_Group) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{3, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{3, 0}
 }
 func (m *GoTestRequiredGroupField_Group) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoTestRequiredGroupField_Group.Unmarshal(m, b)
@@ -1280,7 +1280,7 @@
 func (m *GoSkipTest) String() string { return proto.CompactTextString(m) }
 func (*GoSkipTest) ProtoMessage()    {}
 func (*GoSkipTest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{4}
+	return fileDescriptor_test_800cb821a123159d, []int{4}
 }
 func (m *GoSkipTest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoSkipTest.Unmarshal(m, b)
@@ -1347,7 +1347,7 @@
 func (m *GoSkipTest_SkipGroup) String() string { return proto.CompactTextString(m) }
 func (*GoSkipTest_SkipGroup) ProtoMessage()    {}
 func (*GoSkipTest_SkipGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{4, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{4, 0}
 }
 func (m *GoSkipTest_SkipGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GoSkipTest_SkipGroup.Unmarshal(m, b)
@@ -1394,7 +1394,7 @@
 func (m *NonPackedTest) String() string { return proto.CompactTextString(m) }
 func (*NonPackedTest) ProtoMessage()    {}
 func (*NonPackedTest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{5}
+	return fileDescriptor_test_800cb821a123159d, []int{5}
 }
 func (m *NonPackedTest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NonPackedTest.Unmarshal(m, b)
@@ -1432,7 +1432,7 @@
 func (m *PackedTest) String() string { return proto.CompactTextString(m) }
 func (*PackedTest) ProtoMessage()    {}
 func (*PackedTest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{6}
+	return fileDescriptor_test_800cb821a123159d, []int{6}
 }
 func (m *PackedTest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackedTest.Unmarshal(m, b)
@@ -1471,7 +1471,7 @@
 func (m *MaxTag) String() string { return proto.CompactTextString(m) }
 func (*MaxTag) ProtoMessage()    {}
 func (*MaxTag) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{7}
+	return fileDescriptor_test_800cb821a123159d, []int{7}
 }
 func (m *MaxTag) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MaxTag.Unmarshal(m, b)
@@ -1510,7 +1510,7 @@
 func (m *OldMessage) String() string { return proto.CompactTextString(m) }
 func (*OldMessage) ProtoMessage()    {}
 func (*OldMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{8}
+	return fileDescriptor_test_800cb821a123159d, []int{8}
 }
 func (m *OldMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OldMessage.Unmarshal(m, b)
@@ -1555,7 +1555,7 @@
 func (m *OldMessage_Nested) String() string { return proto.CompactTextString(m) }
 func (*OldMessage_Nested) ProtoMessage()    {}
 func (*OldMessage_Nested) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{8, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{8, 0}
 }
 func (m *OldMessage_Nested) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OldMessage_Nested.Unmarshal(m, b)
@@ -1597,7 +1597,7 @@
 func (m *NewMessage) String() string { return proto.CompactTextString(m) }
 func (*NewMessage) ProtoMessage()    {}
 func (*NewMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{9}
+	return fileDescriptor_test_800cb821a123159d, []int{9}
 }
 func (m *NewMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NewMessage.Unmarshal(m, b)
@@ -1643,7 +1643,7 @@
 func (m *NewMessage_Nested) String() string { return proto.CompactTextString(m) }
 func (*NewMessage_Nested) ProtoMessage()    {}
 func (*NewMessage_Nested) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{9, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{9, 0}
 }
 func (m *NewMessage_Nested) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NewMessage_Nested.Unmarshal(m, b)
@@ -1690,7 +1690,7 @@
 func (m *InnerMessage) String() string { return proto.CompactTextString(m) }
 func (*InnerMessage) ProtoMessage()    {}
 func (*InnerMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{10}
+	return fileDescriptor_test_800cb821a123159d, []int{10}
 }
 func (m *InnerMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InnerMessage.Unmarshal(m, b)
@@ -1748,7 +1748,7 @@
 func (m *OtherMessage) String() string { return proto.CompactTextString(m) }
 func (*OtherMessage) ProtoMessage()    {}
 func (*OtherMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{11}
+	return fileDescriptor_test_800cb821a123159d, []int{11}
 }
 
 var extRange_OtherMessage = []proto.ExtensionRange{
@@ -1815,7 +1815,7 @@
 func (m *RequiredInnerMessage) String() string { return proto.CompactTextString(m) }
 func (*RequiredInnerMessage) ProtoMessage()    {}
 func (*RequiredInnerMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{12}
+	return fileDescriptor_test_800cb821a123159d, []int{12}
 }
 func (m *RequiredInnerMessage) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RequiredInnerMessage.Unmarshal(m, b)
@@ -1866,7 +1866,7 @@
 func (m *MyMessage) String() string { return proto.CompactTextString(m) }
 func (*MyMessage) ProtoMessage()    {}
 func (*MyMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{13}
+	return fileDescriptor_test_800cb821a123159d, []int{13}
 }
 
 var extRange_MyMessage = []proto.ExtensionRange{
@@ -1989,7 +1989,7 @@
 func (m *MyMessage_SomeGroup) String() string { return proto.CompactTextString(m) }
 func (*MyMessage_SomeGroup) ProtoMessage()    {}
 func (*MyMessage_SomeGroup) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{13, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{13, 0}
 }
 func (m *MyMessage_SomeGroup) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MyMessage_SomeGroup.Unmarshal(m, b)
@@ -2028,7 +2028,7 @@
 func (m *Ext) String() string { return proto.CompactTextString(m) }
 func (*Ext) ProtoMessage()    {}
 func (*Ext) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{14}
+	return fileDescriptor_test_800cb821a123159d, []int{14}
 }
 func (m *Ext) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Ext.Unmarshal(m, b)
@@ -2102,7 +2102,7 @@
 func (m *ComplexExtension) String() string { return proto.CompactTextString(m) }
 func (*ComplexExtension) ProtoMessage()    {}
 func (*ComplexExtension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{15}
+	return fileDescriptor_test_800cb821a123159d, []int{15}
 }
 func (m *ComplexExtension) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ComplexExtension.Unmarshal(m, b)
@@ -2154,7 +2154,7 @@
 func (m *DefaultsMessage) String() string { return proto.CompactTextString(m) }
 func (*DefaultsMessage) ProtoMessage()    {}
 func (*DefaultsMessage) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{16}
+	return fileDescriptor_test_800cb821a123159d, []int{16}
 }
 
 var extRange_DefaultsMessage = []proto.ExtensionRange{
@@ -2193,7 +2193,7 @@
 func (m *MyMessageSet) String() string { return proto.CompactTextString(m) }
 func (*MyMessageSet) ProtoMessage()    {}
 func (*MyMessageSet) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{17}
+	return fileDescriptor_test_800cb821a123159d, []int{17}
 }
 
 func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
@@ -2238,7 +2238,7 @@
 func (m *Empty) String() string { return proto.CompactTextString(m) }
 func (*Empty) ProtoMessage()    {}
 func (*Empty) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{18}
+	return fileDescriptor_test_800cb821a123159d, []int{18}
 }
 func (m *Empty) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Empty.Unmarshal(m, b)
@@ -2269,7 +2269,7 @@
 func (m *MessageList) String() string { return proto.CompactTextString(m) }
 func (*MessageList) ProtoMessage()    {}
 func (*MessageList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{19}
+	return fileDescriptor_test_800cb821a123159d, []int{19}
 }
 func (m *MessageList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageList.Unmarshal(m, b)
@@ -2308,7 +2308,7 @@
 func (m *MessageList_Message) String() string { return proto.CompactTextString(m) }
 func (*MessageList_Message) ProtoMessage()    {}
 func (*MessageList_Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{19, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{19, 0}
 }
 func (m *MessageList_Message) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageList_Message.Unmarshal(m, b)
@@ -2354,7 +2354,7 @@
 func (m *Strings) String() string { return proto.CompactTextString(m) }
 func (*Strings) ProtoMessage()    {}
 func (*Strings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{20}
+	return fileDescriptor_test_800cb821a123159d, []int{20}
 }
 func (m *Strings) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Strings.Unmarshal(m, b)
@@ -2422,7 +2422,7 @@
 func (m *Defaults) String() string { return proto.CompactTextString(m) }
 func (*Defaults) ProtoMessage()    {}
 func (*Defaults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{21}
+	return fileDescriptor_test_800cb821a123159d, []int{21}
 }
 func (m *Defaults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Defaults.Unmarshal(m, b)
@@ -2607,7 +2607,7 @@
 func (m *SubDefaults) String() string { return proto.CompactTextString(m) }
 func (*SubDefaults) ProtoMessage()    {}
 func (*SubDefaults) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{22}
+	return fileDescriptor_test_800cb821a123159d, []int{22}
 }
 func (m *SubDefaults) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SubDefaults.Unmarshal(m, b)
@@ -2647,7 +2647,7 @@
 func (m *RepeatedEnum) String() string { return proto.CompactTextString(m) }
 func (*RepeatedEnum) ProtoMessage()    {}
 func (*RepeatedEnum) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{23}
+	return fileDescriptor_test_800cb821a123159d, []int{23}
 }
 func (m *RepeatedEnum) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RepeatedEnum.Unmarshal(m, b)
@@ -2691,7 +2691,7 @@
 func (m *MoreRepeated) String() string { return proto.CompactTextString(m) }
 func (*MoreRepeated) ProtoMessage()    {}
 func (*MoreRepeated) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{24}
+	return fileDescriptor_test_800cb821a123159d, []int{24}
 }
 func (m *MoreRepeated) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MoreRepeated.Unmarshal(m, b)
@@ -2771,7 +2771,7 @@
 func (m *GroupOld) String() string { return proto.CompactTextString(m) }
 func (*GroupOld) ProtoMessage()    {}
 func (*GroupOld) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{25}
+	return fileDescriptor_test_800cb821a123159d, []int{25}
 }
 func (m *GroupOld) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupOld.Unmarshal(m, b)
@@ -2809,7 +2809,7 @@
 func (m *GroupOld_G) String() string { return proto.CompactTextString(m) }
 func (*GroupOld_G) ProtoMessage()    {}
 func (*GroupOld_G) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{25, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{25, 0}
 }
 func (m *GroupOld_G) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupOld_G.Unmarshal(m, b)
@@ -2847,7 +2847,7 @@
 func (m *GroupNew) String() string { return proto.CompactTextString(m) }
 func (*GroupNew) ProtoMessage()    {}
 func (*GroupNew) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{26}
+	return fileDescriptor_test_800cb821a123159d, []int{26}
 }
 func (m *GroupNew) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupNew.Unmarshal(m, b)
@@ -2886,7 +2886,7 @@
 func (m *GroupNew_G) String() string { return proto.CompactTextString(m) }
 func (*GroupNew_G) ProtoMessage()    {}
 func (*GroupNew_G) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{26, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{26, 0}
 }
 func (m *GroupNew_G) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupNew_G.Unmarshal(m, b)
@@ -2932,7 +2932,7 @@
 func (m *FloatingPoint) String() string { return proto.CompactTextString(m) }
 func (*FloatingPoint) ProtoMessage()    {}
 func (*FloatingPoint) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{27}
+	return fileDescriptor_test_800cb821a123159d, []int{27}
 }
 func (m *FloatingPoint) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FloatingPoint.Unmarshal(m, b)
@@ -2980,7 +2980,7 @@
 func (m *MessageWithMap) String() string { return proto.CompactTextString(m) }
 func (*MessageWithMap) ProtoMessage()    {}
 func (*MessageWithMap) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{28}
+	return fileDescriptor_test_800cb821a123159d, []int{28}
 }
 func (m *MessageWithMap) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MessageWithMap.Unmarshal(m, b)
@@ -3060,7 +3060,7 @@
 func (m *Oneof) String() string { return proto.CompactTextString(m) }
 func (*Oneof) ProtoMessage()    {}
 func (*Oneof) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{29}
+	return fileDescriptor_test_800cb821a123159d, []int{29}
 }
 func (m *Oneof) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Oneof.Unmarshal(m, b)
@@ -3627,7 +3627,7 @@
 func (m *Oneof_F_Group) String() string { return proto.CompactTextString(m) }
 func (*Oneof_F_Group) ProtoMessage()    {}
 func (*Oneof_F_Group) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{29, 0}
+	return fileDescriptor_test_800cb821a123159d, []int{29, 0}
 }
 func (m *Oneof_F_Group) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Oneof_F_Group.Unmarshal(m, b)
@@ -3675,7 +3675,7 @@
 func (m *Communique) String() string { return proto.CompactTextString(m) }
 func (*Communique) ProtoMessage()    {}
 func (*Communique) Descriptor() ([]byte, []int) {
-	return fileDescriptor_test_738dd3fb53b9691a, []int{30}
+	return fileDescriptor_test_800cb821a123159d, []int{30}
 }
 func (m *Communique) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Communique.Unmarshal(m, b)
@@ -3908,6 +3908,44 @@
 	return n
 }
 
+type CustomDeterministicMarshaler struct {
+	Field1               *uint64  `protobuf:"varint,1,opt,name=field1" json:"field1,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *CustomDeterministicMarshaler) Reset()         { *m = CustomDeterministicMarshaler{} }
+func (m *CustomDeterministicMarshaler) String() string { return proto.CompactTextString(m) }
+func (*CustomDeterministicMarshaler) ProtoMessage()    {}
+func (*CustomDeterministicMarshaler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_test_800cb821a123159d, []int{31}
+}
+func (m *CustomDeterministicMarshaler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_CustomDeterministicMarshaler.Unmarshal(m, b)
+}
+func (m *CustomDeterministicMarshaler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_CustomDeterministicMarshaler.Marshal(b, m, deterministic)
+}
+func (dst *CustomDeterministicMarshaler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_CustomDeterministicMarshaler.Merge(dst, src)
+}
+func (m *CustomDeterministicMarshaler) XXX_Size() int {
+	return xxx_messageInfo_CustomDeterministicMarshaler.Size(m)
+}
+func (m *CustomDeterministicMarshaler) XXX_DiscardUnknown() {
+	xxx_messageInfo_CustomDeterministicMarshaler.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_CustomDeterministicMarshaler proto.InternalMessageInfo
+
+func (m *CustomDeterministicMarshaler) GetField1() uint64 {
+	if m != nil && m.Field1 != nil {
+		return *m.Field1
+	}
+	return 0
+}
+
 var E_Greeting = &proto.ExtensionDesc{
 	ExtendedType:  (*MyMessage)(nil),
 	ExtensionType: ([]string)(nil),
@@ -4722,6 +4760,7 @@
 	proto.RegisterType((*Oneof)(nil), "test_proto.Oneof")
 	proto.RegisterType((*Oneof_F_Group)(nil), "test_proto.Oneof.F_Group")
 	proto.RegisterType((*Communique)(nil), "test_proto.Communique")
+	proto.RegisterType((*CustomDeterministicMarshaler)(nil), "test_proto.CustomDeterministicMarshaler")
 	proto.RegisterEnum("test_proto.FOO", FOO_name, FOO_value)
 	proto.RegisterEnum("test_proto.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
 	proto.RegisterEnum("test_proto.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
@@ -4818,300 +4857,303 @@
 	proto.RegisterExtension(E_X250)
 }
 
-func init() { proto.RegisterFile("test.proto", fileDescriptor_test_738dd3fb53b9691a) }
+func init() { proto.RegisterFile("test.proto", fileDescriptor_test_800cb821a123159d) }
 
-var fileDescriptor_test_738dd3fb53b9691a = []byte{
-	// 4672 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_test_800cb821a123159d = []byte{
+	// 4710 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0xd9, 0x73, 0x1b, 0x47,
-	0x7a, 0xd7, 0x0c, 0xee, 0x0f, 0x20, 0x31, 0x6c, 0xd1, 0x12, 0x44, 0x59, 0xd2, 0x08, 0x6b, 0xaf,
-	0x61, 0xc9, 0xa6, 0x48, 0x60, 0x08, 0x49, 0x70, 0xec, 0xb2, 0x0e, 0x82, 0x66, 0x49, 0x24, 0xe4,
-	0x21, 0x6d, 0x67, 0x95, 0x07, 0x14, 0x48, 0x0c, 0x40, 0xac, 0x80, 0x19, 0x18, 0x18, 0x44, 0x64,
-	0x52, 0xa9, 0xf2, 0x63, 0xaa, 0xf2, 0x94, 0x4d, 0x52, 0x95, 0xf7, 0xbc, 0xe4, 0x25, 0xd7, 0x43,
-	0xf2, 0x37, 0xc4, 0xd7, 0x5e, 0xde, 0x2b, 0xc9, 0x26, 0x9b, 0xfb, 0xce, 0xe6, 0xde, 0x23, 0x2f,
-	0x4e, 0xf5, 0xd7, 0x3d, 0x33, 0x3d, 0x03, 0xa8, 0x49, 0x3e, 0x61, 0xa6, 0xfb, 0xf7, 0xfd, 0xfa,
-	0xfa, 0xf5, 0xf7, 0xf5, 0xd7, 0x18, 0x00, 0xd7, 0x1a, 0xbb, 0xcb, 0xc3, 0x91, 0xe3, 0x3a, 0x04,
-	0x9f, 0x9b, 0xf8, 0x5c, 0xbc, 0x0e, 0xc9, 0x0d, 0x67, 0xdd, 0x9e, 0x0c, 0xc8, 0x55, 0x88, 0x75,
-	0x1c, 0xa7, 0xa0, 0xe8, 0x6a, 0x69, 0xbe, 0x9c, 0x5f, 0x0e, 0x30, 0xcb, 0xf5, 0x46, 0xc3, 0xa4,
-	0x75, 0xc5, 0x9b, 0x90, 0xdd, 0x70, 0x76, 0xad, 0xb1, 0x5b, 0xef, 0x59, 0xfd, 0x36, 0x59, 0x84,
-	0xc4, 0xc3, 0xd6, 0x9e, 0xd5, 0x47, 0x9b, 0x8c, 0xc9, 0x5e, 0x08, 0x81, 0xf8, 0xee, 0xd1, 0xd0,
-	0x2a, 0xa8, 0x58, 0x88, 0xcf, 0xc5, 0x3f, 0x2c, 0xd2, 0x66, 0xa8, 0x25, 0xb9, 0x0e, 0xf1, 0x07,
-	0x3d, 0xbb, 0xcd, 0xdb, 0x39, 0x2f, 0xb6, 0xc3, 0x10, 0xcb, 0x0f, 0x36, 0xb7, 0xef, 0x9b, 0x08,
-	0xa2, 0x2d, 0xec, 0xb6, 0xf6, 0xfa, 0x94, 0x4c, 0xa1, 0x2d, 0xe0, 0x0b, 0x2d, 0x7d, 0xd4, 0x1a,
-	0xb5, 0x06, 0x85, 0x98, 0xae, 0x94, 0x12, 0x26, 0x7b, 0x21, 0xaf, 0xc3, 0x9c, 0x69, 0xbd, 0x3f,
-	0xe9, 0x8d, 0xac, 0x36, 0x76, 0xaf, 0x10, 0xd7, 0xd5, 0x52, 0x76, 0x56, 0x0b, 0x58, 0x6d, 0x86,
-	0xd1, 0xcc, 0x7c, 0x68, 0xb5, 0x5c, 0xcf, 0x3c, 0xa1, 0xc7, 0x8e, 0x31, 0x17, 0xd0, 0xd4, 0xbc,
-	0x31, 0x74, 0x7b, 0x8e, 0xdd, 0xea, 0x33, 0xf3, 0xa4, 0xae, 0x48, 0xcd, 0x43, 0x68, 0xf2, 0x45,
-	0xc8, 0xd7, 0x9b, 0x77, 0x1d, 0xa7, 0xdf, 0x1c, 0xf1, 0x5e, 0x15, 0x40, 0x57, 0x4b, 0x69, 0x73,
-	0xae, 0x4e, 0x4b, 0xbd, 0xae, 0x92, 0x12, 0x68, 0xf5, 0xe6, 0xa6, 0xed, 0x56, 0xca, 0x01, 0x30,
-	0xab, 0xab, 0xa5, 0x84, 0x39, 0x5f, 0xc7, 0xe2, 0x29, 0x64, 0xd5, 0x08, 0x90, 0x39, 0x5d, 0x2d,
-	0xc5, 0x18, 0xb2, 0x6a, 0xf8, 0xc8, 0x57, 0x80, 0xd4, 0x9b, 0xf5, 0xde, 0xa1, 0xd5, 0x16, 0x59,
-	0xe7, 0x74, 0xb5, 0x94, 0x32, 0xb5, 0x3a, 0xaf, 0x98, 0x81, 0x16, 0x99, 0xe7, 0x75, 0xb5, 0x94,
-	0xf4, 0xd0, 0x02, 0xf7, 0x35, 0x58, 0xa8, 0x37, 0xdf, 0xe9, 0x85, 0x3b, 0x9c, 0xd7, 0xd5, 0xd2,
-	0x9c, 0x99, 0xaf, 0xb3, 0xf2, 0x69, 0xac, 0x48, 0xac, 0xe9, 0x6a, 0x29, 0xce, 0xb1, 0x02, 0x2f,
-	0x8e, 0xae, 0xde, 0x77, 0x5a, 0x6e, 0x00, 0x5d, 0xd0, 0xd5, 0x92, 0x6a, 0xce, 0xd7, 0xb1, 0x38,
-	0xcc, 0x7a, 0xdf, 0x99, 0xec, 0xf5, 0xad, 0x00, 0x4a, 0x74, 0xb5, 0xa4, 0x98, 0xf9, 0x3a, 0x2b,
-	0x0f, 0x63, 0x77, 0xdc, 0x51, 0xcf, 0xee, 0x06, 0xd8, 0xb3, 0xa8, 0xe3, 0x7c, 0x9d, 0x95, 0x87,
-	0x7b, 0x70, 0xf7, 0xc8, 0xb5, 0xc6, 0x01, 0xd4, 0xd2, 0xd5, 0x52, 0xce, 0x9c, 0xaf, 0x63, 0x71,
-	0x84, 0x35, 0x32, 0x07, 0x1d, 0x5d, 0x2d, 0x2d, 0x50, 0xd6, 0x19, 0x73, 0xb0, 0x13, 0x99, 0x83,
-	0xae, 0xae, 0x96, 0x08, 0xc7, 0x0a, 0x73, 0xb0, 0x0c, 0x67, 0xeb, 0xcd, 0x9d, 0x4e, 0x74, 0xe1,
-	0x0e, 0x74, 0xb5, 0x94, 0x37, 0x17, 0xea, 0x5e, 0xcd, 0x2c, 0xbc, 0xc8, 0xde, 0xd3, 0xd5, 0x92,
-	0xe6, 0xe3, 0x05, 0x7e, 0x51, 0x93, 0x4c, 0xea, 0x85, 0x45, 0x3d, 0x26, 0x68, 0x92, 0x15, 0x86,
-	0x35, 0xc9, 0x81, 0xcf, 0xe9, 0x31, 0x51, 0x93, 0x11, 0x24, 0x36, 0xcf, 0x91, 0xe7, 0xf4, 0x98,
-	0xa8, 0x49, 0x8e, 0x8c, 0x68, 0x92, 0x63, 0xcf, 0xeb, 0xb1, 0xb0, 0x26, 0xa7, 0xd0, 0x22, 0x73,
-	0x41, 0x8f, 0x85, 0x35, 0xc9, 0xd1, 0x61, 0x4d, 0x72, 0xf0, 0x05, 0x3d, 0x16, 0xd2, 0x64, 0x14,
-	0x2b, 0x12, 0x2f, 0xe9, 0xb1, 0x90, 0x26, 0xc5, 0xd1, 0x79, 0x9a, 0xe4, 0xd0, 0x8b, 0x7a, 0x4c,
-	0xd4, 0xa4, 0xc8, 0xea, 0x6b, 0x92, 0x43, 0x9f, 0xd7, 0x63, 0x21, 0x4d, 0x8a, 0x58, 0x5f, 0x93,
-	0x1c, 0x7b, 0x49, 0x8f, 0x85, 0x34, 0xc9, 0xb1, 0x2f, 0x8b, 0x9a, 0xe4, 0xd0, 0x0f, 0x15, 0x3d,
-	0x26, 0x8a, 0x92, 0x43, 0xaf, 0x87, 0x44, 0xc9, 0xb1, 0x1f, 0x51, 0xac, 0xa8, 0xca, 0x28, 0x58,
-	0x9c, 0x85, 0x8f, 0x29, 0x58, 0x94, 0x25, 0x07, 0xdf, 0x88, 0xc8, 0x92, 0xc3, 0x3f, 0xa1, 0xf0,
-	0xb0, 0x2e, 0xa7, 0x0d, 0x44, 0xfe, 0x4f, 0xa9, 0x41, 0x58, 0x98, 0xdc, 0x20, 0x10, 0xa6, 0xc3,
-	0x9d, 0x68, 0xe1, 0xb2, 0xae, 0xf8, 0xc2, 0xf4, 0x3c, 0xab, 0x28, 0x4c, 0x1f, 0x78, 0x05, 0x43,
-	0x06, 0x17, 0xe6, 0x14, 0xb2, 0x6a, 0x04, 0x48, 0x5d, 0x57, 0x02, 0x61, 0xfa, 0xc8, 0x90, 0x30,
-	0x7d, 0xec, 0x55, 0x5d, 0x11, 0x85, 0x39, 0x03, 0x2d, 0x32, 0x17, 0x75, 0x45, 0x14, 0xa6, 0x8f,
-	0x16, 0x85, 0xe9, 0x83, 0xbf, 0xa0, 0x2b, 0x82, 0x30, 0xa7, 0xb1, 0x22, 0xf1, 0x0b, 0xba, 0x22,
-	0x08, 0x33, 0x3c, 0x3a, 0x26, 0x4c, 0x1f, 0xfa, 0xa2, 0xae, 0x04, 0xc2, 0x0c, 0xb3, 0x72, 0x61,
-	0xfa, 0xd0, 0x2f, 0xea, 0x8a, 0x20, 0xcc, 0x30, 0x96, 0x0b, 0xd3, 0xc7, 0xbe, 0x84, 0x71, 0xda,
-	0x13, 0xa6, 0x8f, 0x15, 0x84, 0xe9, 0x43, 0x7f, 0x87, 0xc6, 0x74, 0x5f, 0x98, 0x3e, 0x54, 0x14,
-	0xa6, 0x8f, 0xfd, 0x5d, 0x8a, 0x0d, 0x84, 0x39, 0x0d, 0x16, 0x67, 0xe1, 0xf7, 0x28, 0x38, 0x10,
-	0xa6, 0x0f, 0x0e, 0x0b, 0xd3, 0x87, 0xff, 0x3e, 0x85, 0x8b, 0xc2, 0x9c, 0x65, 0x20, 0xf2, 0xff,
-	0x01, 0x35, 0x10, 0x85, 0xe9, 0x1b, 0x2c, 0xe3, 0x30, 0xa9, 0x30, 0xdb, 0x56, 0xa7, 0x35, 0xe9,
-	0x53, 0x19, 0x97, 0xa8, 0x32, 0x6b, 0x71, 0x77, 0x34, 0xb1, 0xe8, 0x58, 0x1d, 0xa7, 0x7f, 0xdf,
-	0xab, 0x23, 0xcb, 0xb4, 0xfb, 0x4c, 0xa0, 0x81, 0xc1, 0xcb, 0x54, 0xa1, 0x35, 0xb5, 0x52, 0x36,
-	0xf3, 0x4c, 0xa5, 0xd3, 0xf8, 0xaa, 0x21, 0xe0, 0xaf, 0x51, 0x9d, 0xd6, 0xd4, 0xaa, 0xc1, 0xf0,
-	0x55, 0x23, 0xc0, 0x57, 0xe8, 0x00, 0x3c, 0xb1, 0x06, 0x16, 0xd7, 0xa9, 0x5a, 0x6b, 0xb1, 0x4a,
-	0x79, 0xc5, 0x5c, 0xf0, 0x24, 0x3b, 0xcb, 0x28, 0xd4, 0xcc, 0x2b, 0x54, 0xb4, 0xb5, 0x58, 0xd5,
-	0xf0, 0x8d, 0xc4, 0x96, 0xca, 0x54, 0xe8, 0x5c, 0xba, 0x81, 0xcd, 0xab, 0x54, 0xbb, 0xb5, 0x78,
-	0xa5, 0xbc, 0xb2, 0x62, 0x6a, 0x5c, 0xc1, 0x33, 0x6c, 0x42, 0xed, 0x2c, 0x53, 0x0d, 0xd7, 0xe2,
-	0x55, 0xc3, 0xb7, 0x09, 0xb7, 0xb3, 0xe0, 0x49, 0x39, 0x30, 0xb9, 0x41, 0xb5, 0x5c, 0x4b, 0x56,
-	0x56, 0x8d, 0xd5, 0xb5, 0xdb, 0x66, 0x9e, 0x69, 0x3a, 0xb0, 0x31, 0x68, 0x3b, 0x5c, 0xd4, 0x81,
-	0xd1, 0x0a, 0x55, 0x75, 0x2d, 0x59, 0xbe, 0xb9, 0x7a, 0xab, 0x7c, 0xcb, 0xd4, 0xb8, 0xba, 0x03,
-	0xab, 0x37, 0xa8, 0x15, 0x97, 0x77, 0x60, 0xb5, 0x4a, 0xf5, 0x5d, 0xd3, 0x0e, 0xac, 0x7e, 0xdf,
-	0x79, 0x45, 0x2f, 0x3e, 0x75, 0x46, 0xfd, 0xf6, 0xd5, 0x22, 0x98, 0x1a, 0x57, 0xbc, 0xd8, 0xea,
-	0x82, 0x27, 0xf9, 0xc0, 0xfc, 0x57, 0xe9, 0x89, 0x35, 0x57, 0x4b, 0xdd, 0xed, 0x75, 0x6d, 0x67,
-	0x6c, 0x99, 0x79, 0x26, 0xfe, 0xc8, 0x9c, 0xec, 0x44, 0xe7, 0xf1, 0x2b, 0xd4, 0x6c, 0xa1, 0x16,
-	0x7b, 0xb5, 0x52, 0xa6, 0x2d, 0xcd, 0x9a, 0xc7, 0x9d, 0xe8, 0x3c, 0xfe, 0x1a, 0xb5, 0x21, 0xb5,
-	0xd8, 0xab, 0x55, 0x83, 0xdb, 0x88, 0xf3, 0x58, 0x85, 0x45, 0x61, 0x2f, 0x04, 0x56, 0xbf, 0x4e,
-	0xad, 0xf2, 0xac, 0x25, 0xe2, 0xef, 0x88, 0x99, 0x76, 0xa1, 0xd6, 0x7e, 0x83, 0xda, 0x69, 0xac,
-	0x35, 0xe2, 0x6f, 0x8c, 0xc0, 0xee, 0x26, 0x9c, 0x8b, 0x9c, 0x25, 0x9a, 0xc3, 0xd6, 0xfe, 0x13,
-	0xab, 0x5d, 0x28, 0xd3, 0x23, 0xc5, 0x5d, 0x55, 0x53, 0xcc, 0xb3, 0xa1, 0x63, 0xc5, 0x23, 0xac,
-	0x26, 0xb7, 0xe1, 0x7c, 0xf4, 0x70, 0xe1, 0x59, 0x56, 0xe8, 0x19, 0x03, 0x2d, 0x17, 0xc3, 0xe7,
-	0x8c, 0x88, 0xa9, 0x10, 0x54, 0x3c, 0x53, 0x83, 0x1e, 0x3a, 0x02, 0xd3, 0x20, 0xb6, 0x70, 0xd3,
-	0xd7, 0xe1, 0xc2, 0xf4, 0xf1, 0xc3, 0x33, 0x5e, 0xa3, 0xa7, 0x10, 0x34, 0x3e, 0x17, 0x3d, 0x89,
-	0x4c, 0x99, 0xcf, 0x68, 0xbb, 0x4a, 0x8f, 0x25, 0xa2, 0xf9, 0x54, 0xeb, 0xaf, 0x41, 0x61, 0xea,
-	0x80, 0xe2, 0x59, 0xdf, 0xa4, 0xe7, 0x14, 0xb4, 0x7e, 0x2e, 0x72, 0x56, 0x89, 0x1a, 0xcf, 0x68,
-	0xfa, 0x16, 0x3d, 0xb8, 0x08, 0xc6, 0x53, 0x2d, 0xe3, 0x94, 0x85, 0x8f, 0x30, 0x9e, 0xed, 0x6d,
-	0x7a, 0x92, 0xe1, 0x53, 0x16, 0x3a, 0xcd, 0x88, 0xed, 0x46, 0xce, 0x34, 0x9e, 0x6d, 0x8d, 0x1e,
-	0x6d, 0x78, 0xbb, 0xe1, 0xe3, 0x0d, 0x37, 0xfe, 0x19, 0x6a, 0xbc, 0x33, 0x7b, 0xc4, 0x3f, 0x8a,
-	0xd1, 0x43, 0x09, 0xb7, 0xde, 0x99, 0x35, 0x64, 0xdf, 0x7a, 0xc6, 0x90, 0x7f, 0x4c, 0xad, 0x89,
-	0x60, 0x3d, 0x35, 0xe6, 0x37, 0x61, 0x69, 0xc6, 0x79, 0xc5, 0xb3, 0xff, 0x09, 0xb5, 0xcf, 0xa3,
-	0xfd, 0xf9, 0xa9, 0xa3, 0xcb, 0x34, 0xc3, 0x8c, 0x1e, 0xfc, 0x94, 0x32, 0x68, 0x21, 0x86, 0xa9,
-	0x3e, 0xd4, 0x61, 0xce, 0x3b, 0x8f, 0x77, 0x47, 0xce, 0x64, 0x58, 0xa8, 0xeb, 0x6a, 0x09, 0xca,
-	0xfa, 0x8c, 0xec, 0xd8, 0x3b, 0x9e, 0x6f, 0x50, 0x9c, 0x19, 0x36, 0x63, 0x3c, 0x8c, 0x99, 0xf1,
-	0x3c, 0xd2, 0x63, 0xcf, 0xe4, 0x61, 0x38, 0x9f, 0x47, 0x30, 0xa3, 0x3c, 0x5e, 0xb8, 0x63, 0x3c,
-	0x8f, 0x75, 0xe5, 0x19, 0x3c, 0x5e, 0xf0, 0xe3, 0x3c, 0x21, 0xb3, 0xa5, 0xb5, 0x20, 0x27, 0xc7,
-	0x7a, 0xf2, 0x42, 0x34, 0x49, 0xdf, 0xc0, 0xec, 0x2a, 0x5c, 0xc8, 0xcc, 0x84, 0xee, 0x4d, 0x9b,
-	0xbd, 0xfd, 0x0c, 0xb3, 0x50, 0x6f, 0xa6, 0xcd, 0x7e, 0x6e, 0x86, 0x59, 0xf1, 0x37, 0x15, 0x88,
-	0x3f, 0xd8, 0xdc, 0xbe, 0x4f, 0xd2, 0x10, 0x7f, 0xb7, 0xb1, 0x79, 0x5f, 0x3b, 0x43, 0x9f, 0xee,
-	0x36, 0x1a, 0x0f, 0x35, 0x85, 0x64, 0x20, 0x71, 0xf7, 0x4b, 0xbb, 0xeb, 0x3b, 0x9a, 0x4a, 0xf2,
-	0x90, 0xad, 0x6f, 0x6e, 0x6f, 0xac, 0x9b, 0x8f, 0xcc, 0xcd, 0xed, 0x5d, 0x2d, 0x46, 0xeb, 0xea,
-	0x0f, 0x1b, 0x77, 0x76, 0xb5, 0x38, 0x49, 0x41, 0x8c, 0x96, 0x25, 0x08, 0x40, 0x72, 0x67, 0xd7,
-	0xdc, 0xdc, 0xde, 0xd0, 0x92, 0x94, 0x65, 0x77, 0x73, 0x6b, 0x5d, 0x4b, 0x51, 0xe4, 0xee, 0x3b,
-	0x8f, 0x1e, 0xae, 0x6b, 0x69, 0xfa, 0x78, 0xc7, 0x34, 0xef, 0x7c, 0x49, 0xcb, 0x50, 0xa3, 0xad,
-	0x3b, 0x8f, 0x34, 0xc0, 0xea, 0x3b, 0x77, 0x1f, 0xae, 0x6b, 0x59, 0x92, 0x83, 0x74, 0xfd, 0x9d,
-	0xed, 0x7b, 0xbb, 0x9b, 0x8d, 0x6d, 0x2d, 0x57, 0xfc, 0x45, 0x28, 0xb0, 0x69, 0x0e, 0xcd, 0x22,
-	0xbb, 0x32, 0x78, 0x13, 0x12, 0x6c, 0x6d, 0x14, 0xd4, 0xca, 0xb5, 0xe9, 0xb5, 0x99, 0x36, 0x5a,
-	0x66, 0xab, 0xc4, 0x0c, 0x97, 0x2e, 0x41, 0x82, 0xcd, 0xd3, 0x22, 0x24, 0xd8, 0xfc, 0xa8, 0x78,
-	0x95, 0xc0, 0x5e, 0x8a, 0xbf, 0xa5, 0x02, 0x6c, 0x38, 0x3b, 0x4f, 0x7a, 0x43, 0xbc, 0xb8, 0xb9,
-	0x04, 0x30, 0x7e, 0xd2, 0x1b, 0x36, 0x71, 0x07, 0xf2, 0x4b, 0x87, 0x0c, 0x2d, 0x41, 0xdf, 0x4b,
-	0xae, 0x42, 0x0e, 0xab, 0xf9, 0x16, 0xc1, 0xbb, 0x86, 0x94, 0x99, 0xa5, 0x65, 0xdc, 0x49, 0x86,
-	0x21, 0x55, 0x03, 0xaf, 0x18, 0x92, 0x02, 0xa4, 0x6a, 0x90, 0x2b, 0x80, 0xaf, 0xcd, 0x31, 0x46,
-	0x53, 0xbc, 0x56, 0xc8, 0x98, 0xd8, 0x2e, 0x8b, 0xaf, 0xe4, 0x0d, 0xc0, 0x36, 0xd9, 0xc8, 0xf3,
-	0xb3, 0x76, 0x89, 0xd7, 0xe1, 0x65, 0xfa, 0xc0, 0xc6, 0x1b, 0x98, 0x2c, 0x35, 0x20, 0xe3, 0x97,
-	0xd3, 0xd6, 0xb0, 0x94, 0x8f, 0x49, 0xc3, 0x31, 0x01, 0x16, 0xf9, 0x83, 0x62, 0x00, 0xde, 0x9f,
-	0x05, 0xec, 0x0f, 0x33, 0x62, 0x1d, 0x2a, 0x5e, 0x82, 0xb9, 0x6d, 0xc7, 0x66, 0xfb, 0x18, 0xe7,
-	0x29, 0x07, 0x4a, 0xab, 0xa0, 0x60, 0xfe, 0xab, 0xb4, 0x8a, 0x97, 0x01, 0x84, 0x3a, 0x0d, 0x94,
-	0x3d, 0x56, 0x87, 0xfe, 0x40, 0xd9, 0x2b, 0x5e, 0x87, 0xe4, 0x56, 0xeb, 0x70, 0xb7, 0xd5, 0x25,
-	0x57, 0x01, 0xfa, 0xad, 0xb1, 0xdb, 0xec, 0xe0, 0x4a, 0x7c, 0xfe, 0xf9, 0xe7, 0x9f, 0x2b, 0x78,
-	0x98, 0xce, 0xd0, 0x52, 0xb6, 0x22, 0x63, 0x80, 0x46, 0xbf, 0xbd, 0x65, 0x8d, 0xc7, 0xad, 0xae,
-	0x45, 0xd6, 0x20, 0x69, 0x5b, 0x63, 0x1a, 0x7d, 0x15, 0xbc, 0x6b, 0xba, 0x24, 0xce, 0x43, 0x80,
-	0x5b, 0xde, 0x46, 0x90, 0xc9, 0xc1, 0x44, 0x83, 0x98, 0x3d, 0x19, 0xe0, 0x8d, 0x5a, 0xc2, 0xa4,
-	0x8f, 0x4b, 0xcf, 0x43, 0x92, 0x61, 0x08, 0x81, 0xb8, 0xdd, 0x1a, 0x58, 0x05, 0xd6, 0x32, 0x3e,
-	0x17, 0xbf, 0xa2, 0x00, 0x6c, 0x5b, 0x4f, 0x4f, 0xd4, 0x6a, 0x80, 0x93, 0xb4, 0x1a, 0x63, 0xad,
-	0xbe, 0x26, 0x6b, 0x95, 0xaa, 0xad, 0xe3, 0x38, 0xed, 0x26, 0x5b, 0x68, 0x76, 0xfd, 0x97, 0xa1,
-	0x25, 0xb8, 0x72, 0xc5, 0xc7, 0x90, 0xdb, 0xb4, 0x6d, 0x6b, 0xe4, 0xf5, 0x8a, 0x40, 0xfc, 0xc0,
-	0x19, 0xbb, 0xfc, 0x26, 0x12, 0x9f, 0x49, 0x01, 0xe2, 0x43, 0x67, 0xe4, 0xb2, 0x91, 0xd6, 0xe2,
-	0xc6, 0xca, 0xca, 0x8a, 0x89, 0x25, 0xe4, 0x79, 0xc8, 0xec, 0x3b, 0xb6, 0x6d, 0xed, 0xd3, 0x61,
-	0xc4, 0x30, 0x75, 0x0c, 0x0a, 0x8a, 0xbf, 0xac, 0x40, 0xae, 0xe1, 0x1e, 0x04, 0xe4, 0x1a, 0xc4,
-	0x9e, 0x58, 0x47, 0xd8, 0xbd, 0x98, 0x49, 0x1f, 0xe9, 0x86, 0xf9, 0xf9, 0x56, 0x7f, 0xc2, 0xee,
-	0x25, 0x73, 0x26, 0x7b, 0x21, 0xe7, 0x20, 0xf9, 0xd4, 0xea, 0x75, 0x0f, 0x5c, 0xe4, 0x54, 0x4d,
-	0xfe, 0x46, 0x96, 0x21, 0xd1, 0xa3, 0x9d, 0x2d, 0xc4, 0x71, 0xc6, 0x0a, 0xe2, 0x8c, 0x89, 0xa3,
-	0x30, 0x19, 0xec, 0x5a, 0x3a, 0xdd, 0xd6, 0x3e, 0xf8, 0xe0, 0x83, 0x0f, 0xd4, 0xe2, 0x01, 0x2c,
-	0x7a, 0x9b, 0x38, 0x34, 0xdc, 0x47, 0x50, 0xe8, 0x5b, 0x4e, 0xb3, 0xd3, 0xb3, 0x5b, 0xfd, 0xfe,
-	0x51, 0xf3, 0xa9, 0x63, 0x37, 0x5b, 0x76, 0xd3, 0x19, 0xef, 0xb7, 0x46, 0x38, 0x05, 0xb2, 0x46,
-	0x16, 0xfb, 0x96, 0x53, 0x67, 0x86, 0xef, 0x39, 0xf6, 0x1d, 0xbb, 0x41, 0xad, 0x8a, 0x9f, 0xc5,
-	0x21, 0xb3, 0x75, 0xe4, 0xf1, 0x2f, 0x42, 0x62, 0xdf, 0x99, 0xd8, 0x6c, 0x3e, 0x13, 0x26, 0x7b,
-	0xf1, 0xd7, 0x49, 0x15, 0xd6, 0x69, 0x11, 0x12, 0xef, 0x4f, 0x1c, 0xd7, 0xc2, 0x21, 0x67, 0x4c,
-	0xf6, 0x42, 0x67, 0x6c, 0x68, 0xb9, 0x85, 0x38, 0x5e, 0x53, 0xd0, 0xc7, 0x60, 0x0e, 0x12, 0x27,
-	0x9a, 0x03, 0xb2, 0x02, 0x49, 0x87, 0xae, 0xc1, 0xb8, 0x90, 0xc4, 0x7b, 0xd8, 0x90, 0x81, 0xb8,
-	0x3a, 0x26, 0xc7, 0x91, 0x07, 0xb0, 0xf0, 0xd4, 0x6a, 0x0e, 0x26, 0x63, 0xb7, 0xd9, 0x75, 0x9a,
-	0x6d, 0xcb, 0x1a, 0x5a, 0xa3, 0xc2, 0x1c, 0xb6, 0x16, 0xf2, 0x10, 0xb3, 0x26, 0xd4, 0x9c, 0x7f,
-	0x6a, 0x6d, 0x4d, 0xc6, 0xee, 0x86, 0x73, 0x1f, 0xed, 0xc8, 0x1a, 0x64, 0x46, 0x16, 0xf5, 0x0b,
-	0xb4, 0xcb, 0xb9, 0xe9, 0x1e, 0x84, 0x8c, 0xd3, 0x23, 0x6b, 0x88, 0x05, 0xe4, 0x26, 0xa4, 0xf7,
-	0x7a, 0x4f, 0xac, 0xf1, 0x81, 0xd5, 0x2e, 0xa4, 0x74, 0xa5, 0x34, 0x5f, 0xbe, 0x28, 0x5a, 0xf9,
-	0x13, 0xbc, 0x7c, 0xcf, 0xe9, 0x3b, 0x23, 0xd3, 0x07, 0x93, 0xd7, 0x21, 0x33, 0x76, 0x06, 0x16,
-	0x53, 0x7b, 0x1a, 0x83, 0xed, 0x95, 0xd9, 0x96, 0x3b, 0xce, 0xc0, 0xf2, 0xbc, 0x9a, 0x67, 0x41,
-	0x2e, 0xb2, 0xee, 0xee, 0xd1, 0x64, 0xa2, 0x00, 0x78, 0xe1, 0x43, 0x3b, 0x85, 0xc9, 0x05, 0x59,
-	0xa2, 0x9d, 0xea, 0x76, 0xe8, 0x99, 0xad, 0x90, 0xc5, 0x5c, 0xde, 0x7f, 0x5f, 0x7a, 0x05, 0x32,
-	0x3e, 0x61, 0xe0, 0x0e, 0x99, 0x0b, 0xca, 0xa0, 0x87, 0x60, 0xee, 0x90, 0xf9, 0x9f, 0x17, 0x21,
-	0x81, 0x1d, 0xa7, 0x91, 0xcb, 0x5c, 0xa7, 0x81, 0x32, 0x03, 0x89, 0x0d, 0x73, 0x7d, 0x7d, 0x5b,
-	0x53, 0x30, 0x66, 0x3e, 0x7c, 0x67, 0x5d, 0x53, 0x05, 0xfd, 0xfe, 0xb6, 0x0a, 0xb1, 0xf5, 0x43,
-	0x54, 0x4e, 0xbb, 0xe5, 0xb6, 0xbc, 0x1d, 0x4e, 0x9f, 0x49, 0x0d, 0x32, 0x83, 0x96, 0xd7, 0x96,
-	0x8a, 0x53, 0x1c, 0xf2, 0x25, 0xeb, 0x87, 0xee, 0xf2, 0x56, 0x8b, 0xb5, 0xbc, 0x6e, 0xbb, 0xa3,
-	0x23, 0x33, 0x3d, 0xe0, 0xaf, 0x4b, 0xaf, 0xc1, 0x5c, 0xa8, 0x4a, 0xdc, 0xa2, 0x89, 0x19, 0x5b,
-	0x34, 0xc1, 0xb7, 0x68, 0x4d, 0xbd, 0xa5, 0x94, 0x6b, 0x10, 0x1f, 0x38, 0x23, 0x8b, 0x3c, 0x37,
-	0x73, 0x82, 0x0b, 0x5d, 0x94, 0x4c, 0x3e, 0xd2, 0x15, 0x13, 0x6d, 0xca, 0x2f, 0x43, 0xdc, 0xb5,
-	0x0e, 0xdd, 0x67, 0xd9, 0x1e, 0xb0, 0xf1, 0x51, 0x48, 0xf9, 0x55, 0x48, 0xda, 0x93, 0xc1, 0x9e,
-	0x35, 0x7a, 0x16, 0xb8, 0x87, 0x1d, 0xe3, 0xa0, 0xe2, 0xbb, 0xa0, 0xdd, 0x73, 0x06, 0xc3, 0xbe,
-	0x75, 0xb8, 0x7e, 0xe8, 0x5a, 0xf6, 0xb8, 0xe7, 0xd8, 0x74, 0x0c, 0x9d, 0xde, 0x08, 0xdd, 0x1a,
-	0x8e, 0x01, 0x5f, 0xa8, 0x9b, 0x19, 0x5b, 0xfb, 0x8e, 0xdd, 0xe6, 0x43, 0xe3, 0x6f, 0x14, 0xed,
-	0x1e, 0xf4, 0x46, 0xd4, 0xa3, 0xd1, 0xe0, 0xc3, 0x5e, 0x8a, 0x1b, 0x90, 0xe7, 0x69, 0xd8, 0x98,
-	0x37, 0x5c, 0xbc, 0x06, 0x39, 0xaf, 0x08, 0xff, 0xf9, 0x49, 0x43, 0xfc, 0xf1, 0xba, 0xd9, 0xd0,
-	0xce, 0xd0, 0x75, 0x6d, 0x6c, 0xaf, 0x6b, 0x0a, 0x7d, 0xd8, 0x7d, 0xaf, 0x11, 0x5a, 0xcb, 0xe7,
-	0x21, 0xe7, 0xf7, 0x7d, 0xc7, 0x72, 0xb1, 0x86, 0x46, 0xa9, 0x54, 0x4d, 0x4d, 0x2b, 0xc5, 0x14,
-	0x24, 0xd6, 0x07, 0x43, 0xf7, 0xa8, 0xf8, 0x4b, 0x90, 0xe5, 0xa0, 0x87, 0xbd, 0xb1, 0x4b, 0x6e,
-	0x43, 0x6a, 0xc0, 0xc7, 0xab, 0xe0, 0x59, 0x34, 0x2c, 0xeb, 0x00, 0xe9, 0x3d, 0x9b, 0x1e, 0x7e,
-	0xa9, 0x02, 0x29, 0xc1, 0xbd, 0x73, 0xcf, 0xa3, 0x8a, 0x9e, 0x87, 0xf9, 0xa8, 0x98, 0xe0, 0xa3,
-	0x8a, 0x5b, 0x90, 0x62, 0x81, 0x79, 0x8c, 0xc7, 0x0d, 0x96, 0xbf, 0x33, 0x8d, 0x31, 0xf1, 0x65,
-	0x59, 0x19, 0x3b, 0x43, 0x5d, 0x81, 0x2c, 0xee, 0x19, 0x5f, 0x85, 0xd4, 0x9b, 0x03, 0x16, 0x31,
-	0xc5, 0xff, 0x51, 0x02, 0xd2, 0xde, 0x5c, 0x91, 0x8b, 0x90, 0x64, 0x49, 0x2c, 0x52, 0x79, 0x97,
-	0x3a, 0x09, 0x4c, 0x5b, 0xc9, 0x45, 0x48, 0xf1, 0x44, 0x95, 0x07, 0x1c, 0xb5, 0x52, 0x36, 0x93,
-	0x2c, 0x31, 0xf5, 0x2b, 0xab, 0x06, 0xfa, 0x49, 0x76, 0x5d, 0x93, 0x64, 0xa9, 0x27, 0xd1, 0x21,
-	0xe3, 0x27, 0x9b, 0x18, 0x22, 0xf8, 0xdd, 0x4c, 0xda, 0xcb, 0x2e, 0x05, 0x44, 0xd5, 0x40, 0x07,
-	0xca, 0x2f, 0x62, 0xd2, 0xf5, 0xe0, 0xdc, 0x94, 0xf6, 0x52, 0x46, 0xfc, 0xe7, 0xc9, 0xbb, 0x75,
-	0x49, 0xf1, 0x24, 0x31, 0x00, 0x54, 0x0d, 0xf4, 0x4c, 0xde, 0x15, 0x4b, 0x8a, 0x27, 0x82, 0xe4,
-	0x0a, 0xed, 0x22, 0x26, 0x76, 0xe8, 0x7f, 0x82, 0xfb, 0x94, 0x24, 0x4b, 0xf7, 0xc8, 0x55, 0xca,
-	0xc0, 0xb2, 0x37, 0x74, 0x0d, 0xc1, 0xe5, 0x49, 0x8a, 0x27, 0x75, 0xe4, 0x3a, 0x85, 0xb0, 0xe9,
-	0x2f, 0xc0, 0x33, 0x6e, 0x4a, 0x52, 0xfc, 0xa6, 0x84, 0xe8, 0xb4, 0x41, 0xf4, 0x50, 0xe8, 0x95,
-	0x84, 0x5b, 0x91, 0x24, 0xbb, 0x15, 0x21, 0x97, 0x91, 0x8e, 0x0d, 0x2a, 0x17, 0xdc, 0x80, 0xa4,
-	0x78, 0x16, 0x18, 0xd4, 0xe3, 0x59, 0xd2, 0xbf, 0xed, 0x48, 0xf1, 0x3c, 0x8f, 0xdc, 0xa2, 0xeb,
-	0x45, 0x15, 0x5e, 0x98, 0x47, 0x5f, 0xbc, 0x24, 0x4a, 0xcf, 0x5b, 0x55, 0xe6, 0x8a, 0x6b, 0xcc,
-	0x8d, 0x99, 0x89, 0x3a, 0xee, 0x88, 0x25, 0x6a, 0xf9, 0xa8, 0x67, 0x77, 0x0a, 0x79, 0x9c, 0x8b,
-	0x58, 0xcf, 0xee, 0x98, 0x89, 0x3a, 0x2d, 0x61, 0x2a, 0xd8, 0xa6, 0x75, 0x1a, 0xd6, 0xc5, 0x5f,
-	0x65, 0x95, 0xb4, 0x88, 0x14, 0x20, 0x51, 0x6f, 0x6e, 0xb7, 0xec, 0xc2, 0x02, 0xb3, 0xb3, 0x5b,
-	0xb6, 0x19, 0xaf, 0x6f, 0xb7, 0x6c, 0xf2, 0x32, 0xc4, 0xc6, 0x93, 0xbd, 0x02, 0x99, 0xfe, 0x5b,
-	0x70, 0x67, 0xb2, 0xe7, 0x75, 0xc6, 0xa4, 0x18, 0x72, 0x11, 0xd2, 0x63, 0x77, 0xd4, 0xfc, 0x05,
-	0x6b, 0xe4, 0x14, 0xce, 0xe2, 0x34, 0x9e, 0x31, 0x53, 0x63, 0x77, 0xf4, 0xd8, 0x1a, 0x39, 0x27,
-	0xf4, 0xc1, 0xc5, 0xcb, 0x90, 0x15, 0x78, 0x49, 0x1e, 0x14, 0x9b, 0x1d, 0x60, 0x6a, 0xca, 0x4d,
-	0x53, 0xb1, 0x8b, 0xef, 0x42, 0xce, 0x4b, 0xb1, 0x70, 0xc4, 0x06, 0xdd, 0x4d, 0x7d, 0x67, 0x84,
-	0xbb, 0x74, 0xbe, 0x7c, 0x39, 0x1c, 0x31, 0x03, 0x20, 0x8f, 0x5c, 0x0c, 0x5c, 0xd4, 0x22, 0x9d,
-	0x51, 0x8a, 0x3f, 0x50, 0x20, 0xb7, 0xe5, 0x8c, 0x82, 0xff, 0x2f, 0x16, 0x21, 0xb1, 0xe7, 0x38,
-	0xfd, 0x31, 0x12, 0xa7, 0x4d, 0xf6, 0x42, 0x5e, 0x84, 0x1c, 0x3e, 0x78, 0x49, 0xb2, 0xea, 0xdf,
-	0x02, 0x65, 0xb1, 0x9c, 0xe7, 0xc5, 0x04, 0xe2, 0x3d, 0xdb, 0x1d, 0x73, 0x8f, 0x86, 0xcf, 0xe4,
-	0x0b, 0x90, 0xa5, 0xbf, 0x9e, 0x65, 0xdc, 0x3f, 0x4d, 0x03, 0x2d, 0xe6, 0x86, 0x2f, 0xc1, 0x1c,
-	0x6a, 0xc0, 0x87, 0xa5, 0xfc, 0x1b, 0x9f, 0x1c, 0xab, 0xe0, 0xc0, 0x02, 0xa4, 0x98, 0x43, 0x18,
-	0xe3, 0x1f, 0xbe, 0x19, 0xd3, 0x7b, 0xa5, 0x6e, 0x16, 0x13, 0x15, 0x76, 0x02, 0x49, 0x99, 0xfc,
-	0xad, 0x78, 0x0f, 0xd2, 0x18, 0x2e, 0x1b, 0xfd, 0x36, 0x79, 0x01, 0x94, 0x6e, 0xc1, 0xc2, 0x70,
-	0x7d, 0x2e, 0x94, 0x85, 0x70, 0xc0, 0xf2, 0x86, 0xa9, 0x74, 0x97, 0x16, 0x40, 0xd9, 0xa0, 0x69,
-	0xc1, 0x21, 0x77, 0xd8, 0xca, 0x61, 0xf1, 0x6d, 0x4e, 0xb2, 0x6d, 0x3d, 0x95, 0x93, 0x6c, 0x5b,
-	0x4f, 0x19, 0xc9, 0x95, 0x29, 0x12, 0xfa, 0x76, 0xc4, 0xff, 0x03, 0x57, 0x8e, 0x8a, 0x15, 0x98,
-	0xc3, 0x8d, 0xda, 0xb3, 0xbb, 0x8f, 0x9c, 0x9e, 0x8d, 0x89, 0x48, 0x07, 0x0f, 0x70, 0x8a, 0xa9,
-	0x74, 0xe8, 0x3a, 0x58, 0x87, 0xad, 0x7d, 0x76, 0x1c, 0x4e, 0x9b, 0xec, 0xa5, 0xf8, 0xfd, 0x38,
-	0xcc, 0x73, 0x27, 0xfb, 0x5e, 0xcf, 0x3d, 0xd8, 0x6a, 0x0d, 0xc9, 0x36, 0xe4, 0xa8, 0x7f, 0x6d,
-	0x0e, 0x5a, 0xc3, 0x21, 0xdd, 0xc8, 0x0a, 0x86, 0xe6, 0xeb, 0x33, 0xdc, 0x36, 0xb7, 0x58, 0xde,
-	0x6e, 0x0d, 0xac, 0x2d, 0x86, 0x66, 0x81, 0x3a, 0x6b, 0x07, 0x25, 0xe4, 0x01, 0x64, 0x07, 0xe3,
-	0xae, 0x4f, 0xc7, 0x22, 0xfd, 0x35, 0x09, 0xdd, 0xd6, 0xb8, 0x1b, 0x62, 0x83, 0x81, 0x5f, 0x40,
-	0x3b, 0x47, 0xbd, 0xb3, 0xcf, 0x16, 0x3b, 0xb6, 0x73, 0xd4, 0x95, 0x84, 0x3b, 0xb7, 0x17, 0x94,
-	0x90, 0x3a, 0x00, 0xdd, 0x6a, 0xae, 0x43, 0x33, 0x3c, 0xd4, 0x52, 0xb6, 0x5c, 0x92, 0xb0, 0xed,
-	0xb8, 0xa3, 0x5d, 0x67, 0xc7, 0x1d, 0xf1, 0x03, 0xc9, 0x98, 0xbf, 0x2e, 0xbd, 0x01, 0x5a, 0x74,
-	0x16, 0x8e, 0x3b, 0x93, 0x64, 0x84, 0x33, 0xc9, 0xd2, 0xcf, 0x42, 0x3e, 0x32, 0x6c, 0xd1, 0x9c,
-	0x30, 0xf3, 0x1b, 0xa2, 0x79, 0xb6, 0x7c, 0x21, 0xf4, 0x8d, 0x86, 0xb8, 0xf4, 0x22, 0xf3, 0x1b,
-	0xa0, 0x45, 0xa7, 0x40, 0xa4, 0x4e, 0x4b, 0x12, 0x1a, 0xb4, 0x7f, 0x0d, 0xe6, 0x42, 0x83, 0x16,
-	0x8d, 0x33, 0xc7, 0x0c, 0xab, 0xf8, 0x2b, 0x09, 0x48, 0x34, 0x6c, 0xcb, 0xe9, 0x90, 0xf3, 0xe1,
-	0xd8, 0xf9, 0xd6, 0x19, 0x2f, 0x6e, 0x5e, 0x88, 0xc4, 0xcd, 0xb7, 0xce, 0xf8, 0x51, 0xf3, 0x42,
-	0x24, 0x6a, 0x7a, 0x55, 0x55, 0x83, 0x5c, 0x9a, 0x8a, 0x99, 0x6f, 0x9d, 0x11, 0x02, 0xe6, 0xa5,
-	0xa9, 0x80, 0x19, 0x54, 0x57, 0x0d, 0xea, 0x60, 0xc3, 0xd1, 0xf2, 0xad, 0x33, 0x41, 0xa4, 0xbc,
-	0x18, 0x8d, 0x94, 0x7e, 0x65, 0xd5, 0x60, 0x5d, 0x12, 0xa2, 0x24, 0x76, 0x89, 0xc5, 0xc7, 0x8b,
-	0xd1, 0xf8, 0x88, 0x76, 0x3c, 0x32, 0x5e, 0x8c, 0x46, 0x46, 0xac, 0xe4, 0x91, 0xf0, 0x42, 0x24,
-	0x12, 0x22, 0x29, 0x0b, 0x81, 0x17, 0xa3, 0x21, 0x90, 0xd9, 0x09, 0x3d, 0x15, 0xe3, 0x9f, 0x5f,
-	0x59, 0x35, 0x88, 0x11, 0x09, 0x7e, 0xb2, 0x44, 0x04, 0x57, 0x03, 0xc3, 0x40, 0x95, 0x4e, 0x9c,
-	0x77, 0x40, 0xcd, 0x4b, 0x3f, 0x61, 0xc1, 0x19, 0xf5, 0x0e, 0x68, 0x06, 0xa4, 0x3a, 0x3c, 0x57,
-	0xd7, 0xd0, 0x93, 0x85, 0xc4, 0x89, 0x12, 0x58, 0xae, 0x37, 0xd1, 0xa3, 0xd1, 0xd1, 0x75, 0x58,
-	0xc2, 0x51, 0x82, 0xb9, 0x7a, 0xf3, 0x61, 0x6b, 0xd4, 0xa5, 0xd0, 0xdd, 0x56, 0xd7, 0xbf, 0xf5,
-	0xa0, 0x2a, 0xc8, 0xd6, 0x79, 0xcd, 0x6e, 0xab, 0x4b, 0xce, 0x79, 0x12, 0x6b, 0x63, 0xad, 0xc2,
-	0x45, 0xb6, 0x74, 0x9e, 0x4e, 0x1d, 0x23, 0x43, 0xdf, 0xb8, 0xc0, 0x7d, 0xe3, 0xdd, 0x14, 0x24,
-	0x26, 0x76, 0xcf, 0xb1, 0xef, 0x66, 0x20, 0xe5, 0x3a, 0xa3, 0x41, 0xcb, 0x75, 0x8a, 0x3f, 0x54,
-	0x00, 0xee, 0x39, 0x83, 0xc1, 0xc4, 0xee, 0xbd, 0x3f, 0xb1, 0xc8, 0x65, 0xc8, 0x0e, 0x5a, 0x4f,
-	0xac, 0xe6, 0xc0, 0x6a, 0xee, 0x8f, 0xbc, 0xdd, 0x90, 0xa1, 0x45, 0x5b, 0xd6, 0xbd, 0xd1, 0x11,
-	0x29, 0x78, 0x07, 0x78, 0x54, 0x10, 0x0a, 0x93, 0x1f, 0xe8, 0x17, 0xf9, 0x71, 0x34, 0xc9, 0x57,
-	0xd2, 0x3b, 0x90, 0xb2, 0x24, 0x27, 0xc5, 0xd7, 0x90, 0xa5, 0x39, 0xe7, 0x21, 0xe9, 0x5a, 0x83,
-	0x61, 0x73, 0x1f, 0x05, 0x43, 0x45, 0x91, 0xa0, 0xef, 0xf7, 0xc8, 0x0d, 0x88, 0xed, 0x3b, 0x7d,
-	0x94, 0xca, 0xb1, 0xab, 0x43, 0x91, 0xe4, 0x25, 0x88, 0x0d, 0xc6, 0x4c, 0x3e, 0xd9, 0xf2, 0xd9,
-	0xd0, 0x09, 0x82, 0x85, 0x2c, 0x0a, 0x1c, 0x8c, 0xbb, 0xfe, 0xd8, 0xaf, 0xe5, 0x21, 0x56, 0x6f,
-	0x34, 0xe8, 0xa9, 0xa0, 0xde, 0x68, 0xac, 0x6a, 0x4a, 0x6d, 0x15, 0xd2, 0xdd, 0x91, 0x65, 0x51,
-	0x47, 0xf1, 0xac, 0xac, 0xe4, 0xcb, 0x18, 0x05, 0x7d, 0x58, 0xed, 0x6d, 0x48, 0xed, 0xb3, 0xbc,
-	0x84, 0x3c, 0x33, 0x07, 0x2f, 0xfc, 0x31, 0xbb, 0x0b, 0x7a, 0x5e, 0x04, 0x44, 0xb3, 0x19, 0xd3,
-	0xe3, 0xa9, 0xed, 0x42, 0x66, 0xd4, 0x3c, 0x9e, 0xf4, 0x43, 0x16, 0x79, 0xe4, 0xa4, 0xe9, 0x11,
-	0x2f, 0xaa, 0x6d, 0xc0, 0x82, 0xed, 0x78, 0x7f, 0x49, 0x35, 0xdb, 0x7c, 0xdf, 0xcd, 0x3a, 0xf2,
-	0x79, 0x0d, 0x58, 0xec, 0x8f, 0x6d, 0xdb, 0xe1, 0x15, 0x6c, 0xaf, 0xd6, 0xd6, 0x41, 0x13, 0x88,
-	0x3a, 0x6c, 0x73, 0xcb, 0x78, 0x3a, 0xec, 0xbf, 0x74, 0x9f, 0x07, 0xfd, 0x41, 0x84, 0x86, 0xef,
-	0x58, 0x19, 0x4d, 0x97, 0x7d, 0x9a, 0xe0, 0xd3, 0xa0, 0x13, 0x9c, 0xa6, 0xa1, 0xfe, 0x4b, 0x46,
-	0x73, 0xc0, 0xbe, 0x5b, 0x10, 0x69, 0xaa, 0x46, 0x64, 0x76, 0x26, 0x27, 0xe8, 0x4e, 0x8f, 0x7d,
-	0x78, 0xe0, 0xf3, 0x30, 0xf7, 0x38, 0x83, 0xe8, 0xb8, 0x0e, 0x7d, 0x99, 0x7d, 0x95, 0x10, 0x22,
-	0x9a, 0xea, 0xd1, 0xf8, 0x04, 0x3d, 0x7a, 0xc2, 0x3e, 0x02, 0xf0, 0x89, 0x76, 0x66, 0xf5, 0x68,
-	0x7c, 0x82, 0x1e, 0xf5, 0xd9, 0x07, 0x02, 0x21, 0xa2, 0xaa, 0x51, 0xdb, 0x04, 0x22, 0x2e, 0x3c,
-	0x8f, 0x25, 0x52, 0xa6, 0x01, 0xfb, 0xf0, 0x23, 0x58, 0x7a, 0x66, 0x34, 0x8b, 0xea, 0xb8, 0x4e,
-	0xd9, 0xec, 0xab, 0x90, 0x30, 0x55, 0xd5, 0xa8, 0x3d, 0x80, 0xb3, 0xe2, 0xf0, 0x4e, 0xd4, 0x2d,
-	0x87, 0x7d, 0xd2, 0x10, 0x0c, 0x90, 0x5b, 0xcd, 0x24, 0x3b, 0xae, 0x63, 0x43, 0xf6, 0xb9, 0x43,
-	0x84, 0xac, 0x6a, 0xd4, 0xee, 0x41, 0x5e, 0x20, 0xdb, 0xc3, 0x2c, 0x58, 0x46, 0xf4, 0x3e, 0xfb,
-	0x48, 0xc7, 0x27, 0xa2, 0xf1, 0x3f, 0xba, 0x7a, 0x2c, 0x22, 0x4a, 0x69, 0x46, 0xec, 0x1b, 0x93,
-	0xa0, 0x3f, 0x68, 0x13, 0xd9, 0x28, 0x7b, 0x2c, 0x7c, 0xca, 0x78, 0xc6, 0xec, 0xfb, 0x93, 0xa0,
-	0x3b, 0xd4, 0xa4, 0x36, 0x08, 0x0d, 0xca, 0xa2, 0x41, 0x51, 0xca, 0xe2, 0xa2, 0xff, 0x2e, 0x49,
-	0x20, 0xcb, 0xe2, 0x65, 0x8b, 0x30, 0x7c, 0xfa, 0x5a, 0x7b, 0x00, 0xf3, 0xa7, 0x71, 0x59, 0x1f,
-	0x2a, 0x2c, 0xf3, 0xae, 0x2c, 0xd3, 0xe4, 0xdc, 0x9c, 0x6b, 0x87, 0x3c, 0xd7, 0x06, 0xcc, 0x9d,
-	0xc2, 0x6d, 0x7d, 0xa4, 0xb0, 0xfc, 0x95, 0x72, 0x99, 0xb9, 0x76, 0xd8, 0x77, 0xcd, 0x9d, 0xc2,
-	0x71, 0x7d, 0xac, 0xb0, 0x0b, 0x0f, 0xa3, 0xec, 0xd3, 0x78, 0xbe, 0x6b, 0xee, 0x14, 0x8e, 0xeb,
-	0x13, 0x96, 0x9f, 0xaa, 0x46, 0x45, 0xa4, 0x41, 0x4f, 0x31, 0x7f, 0x1a, 0xc7, 0xf5, 0xa9, 0x82,
-	0x17, 0x20, 0xaa, 0x61, 0xf8, 0xf3, 0xe3, 0xfb, 0xae, 0xf9, 0xd3, 0x38, 0xae, 0xaf, 0x2a, 0x78,
-	0x51, 0xa2, 0x1a, 0x6b, 0x21, 0xa2, 0x70, 0x8f, 0x4e, 0xe2, 0xb8, 0xbe, 0xa6, 0xe0, 0xed, 0x85,
-	0x6a, 0x54, 0x7d, 0xa2, 0x9d, 0xa9, 0x1e, 0x9d, 0xc4, 0x71, 0x7d, 0x1d, 0xb3, 0x81, 0x9a, 0x6a,
-	0xdc, 0x0c, 0x11, 0xa1, 0xef, 0xca, 0x9f, 0xca, 0x71, 0x7d, 0x43, 0xc1, 0x8b, 0x26, 0xd5, 0xb8,
-	0x65, 0x7a, 0x3d, 0x08, 0x7c, 0x57, 0xfe, 0x54, 0x8e, 0xeb, 0x9b, 0x0a, 0xde, 0x48, 0xa9, 0xc6,
-	0xed, 0x30, 0x15, 0xfa, 0x2e, 0xed, 0x74, 0x8e, 0xeb, 0x33, 0x05, 0xbf, 0x3f, 0x51, 0xd7, 0x56,
-	0x4c, 0xaf, 0x13, 0x82, 0xef, 0xd2, 0x4e, 0xe7, 0xb8, 0xbe, 0xa5, 0xe0, 0x47, 0x29, 0xea, 0xda,
-	0x6a, 0x84, 0xac, 0x6a, 0xd4, 0xd6, 0x21, 0x77, 0x72, 0xc7, 0xf5, 0x6d, 0xf1, 0xbe, 0x2f, 0xdb,
-	0x16, 0xbc, 0xd7, 0x63, 0x61, 0xfd, 0x4e, 0xe0, 0xba, 0xbe, 0x83, 0x59, 0x53, 0xed, 0xb9, 0xb7,
-	0xd8, 0xad, 0x18, 0x33, 0x79, 0xa5, 0x6d, 0x75, 0x5e, 0xef, 0x38, 0x4e, 0xb0, 0xa4, 0xcc, 0xa1,
-	0x35, 0x82, 0xdd, 0x73, 0x02, 0x6f, 0xf6, 0x5d, 0x05, 0x2f, 0xd1, 0x72, 0x9c, 0x1a, 0x2d, 0xfc,
-	0x7d, 0xc4, 0x5c, 0x9b, 0x1d, 0x8c, 0xf9, 0x78, 0xbf, 0xf6, 0x3d, 0xe5, 0x74, 0x8e, 0xad, 0x16,
-	0x6b, 0x6c, 0xaf, 0xfb, 0x93, 0x83, 0x25, 0x6f, 0x42, 0xfc, 0xb0, 0xbc, 0xb2, 0x1a, 0x3e, 0xe2,
-	0x89, 0x77, 0xc8, 0xcc, 0x9d, 0x65, 0xcb, 0x0b, 0xa1, 0xcb, 0xf6, 0xc1, 0xd0, 0x3d, 0x32, 0xd1,
-	0x92, 0x33, 0x94, 0x25, 0x0c, 0x1f, 0x49, 0x19, 0xca, 0x9c, 0xa1, 0x22, 0x61, 0xf8, 0x58, 0xca,
-	0x50, 0xe1, 0x0c, 0x86, 0x84, 0xe1, 0x13, 0x29, 0x83, 0xc1, 0x19, 0xd6, 0x24, 0x0c, 0x9f, 0x4a,
-	0x19, 0xd6, 0x38, 0x43, 0x55, 0xc2, 0xf0, 0x55, 0x29, 0x43, 0x95, 0x33, 0xdc, 0x94, 0x30, 0x7c,
-	0x4d, 0xca, 0x70, 0x93, 0x33, 0xdc, 0x92, 0x30, 0x7c, 0x5d, 0xca, 0x70, 0x8b, 0x33, 0xdc, 0x96,
-	0x30, 0x7c, 0x43, 0xca, 0x70, 0x9b, 0x31, 0xac, 0xae, 0x48, 0x18, 0xbe, 0x29, 0x63, 0x58, 0x5d,
-	0xe1, 0x0c, 0x32, 0x4d, 0x7e, 0x26, 0x65, 0xe0, 0x9a, 0x5c, 0x95, 0x69, 0xf2, 0x5b, 0x52, 0x06,
-	0xae, 0xc9, 0x55, 0x99, 0x26, 0xbf, 0x2d, 0x65, 0xe0, 0x9a, 0x5c, 0x95, 0x69, 0xf2, 0x3b, 0x52,
-	0x06, 0xae, 0xc9, 0x55, 0x99, 0x26, 0xbf, 0x2b, 0x65, 0xe0, 0x9a, 0x5c, 0x95, 0x69, 0xf2, 0x7b,
-	0x52, 0x06, 0xae, 0xc9, 0x55, 0x99, 0x26, 0xff, 0x44, 0xca, 0xc0, 0x35, 0xb9, 0x2a, 0xd3, 0xe4,
-	0x9f, 0x4a, 0x19, 0xb8, 0x26, 0x57, 0x65, 0x9a, 0xfc, 0x33, 0x29, 0x03, 0xd7, 0x64, 0x59, 0xa6,
-	0xc9, 0xef, 0xcb, 0x18, 0xca, 0x5c, 0x93, 0x65, 0x99, 0x26, 0xff, 0x5c, 0xca, 0xc0, 0x35, 0x59,
-	0x96, 0x69, 0xf2, 0x2f, 0xa4, 0x0c, 0x5c, 0x93, 0x65, 0x99, 0x26, 0x7f, 0x20, 0x65, 0xe0, 0x9a,
-	0x2c, 0xcb, 0x34, 0xf9, 0x97, 0x52, 0x06, 0xae, 0xc9, 0xb2, 0x4c, 0x93, 0x7f, 0x25, 0x65, 0xe0,
-	0x9a, 0x2c, 0xcb, 0x34, 0xf9, 0xd7, 0x52, 0x06, 0xae, 0xc9, 0xb2, 0x4c, 0x93, 0x7f, 0x23, 0x65,
-	0xe0, 0x9a, 0x2c, 0xcb, 0x34, 0xf9, 0xb7, 0x52, 0x06, 0xae, 0xc9, 0xb2, 0x4c, 0x93, 0x7f, 0x27,
-	0x65, 0xe0, 0x9a, 0xac, 0xc8, 0x34, 0xf9, 0xf7, 0x32, 0x86, 0x0a, 0xd7, 0x64, 0x45, 0xa6, 0xc9,
-	0x7f, 0x90, 0x32, 0x70, 0x4d, 0x56, 0x64, 0x9a, 0xfc, 0x47, 0x29, 0x03, 0xd7, 0x64, 0x45, 0xa6,
-	0xc9, 0x7f, 0x92, 0x32, 0x70, 0x4d, 0x56, 0x64, 0x9a, 0xfc, 0x67, 0x29, 0x03, 0xd7, 0x64, 0x45,
-	0xa6, 0xc9, 0x7f, 0x91, 0x32, 0x70, 0x4d, 0x56, 0x64, 0x9a, 0xfc, 0x57, 0x29, 0x03, 0xd7, 0x64,
-	0x45, 0xa6, 0xc9, 0x7f, 0x93, 0x32, 0x70, 0x4d, 0x56, 0x64, 0x9a, 0xfc, 0xa1, 0x94, 0x81, 0x6b,
-	0xb2, 0x22, 0xd3, 0xe4, 0xbf, 0x4b, 0x19, 0xb8, 0x26, 0x0d, 0x99, 0x26, 0xff, 0x43, 0xc6, 0x60,
-	0x70, 0x4d, 0x1a, 0x32, 0x4d, 0xfe, 0xa7, 0x94, 0x81, 0x6b, 0xd2, 0x90, 0x69, 0xf2, 0xbf, 0xa4,
-	0x0c, 0x5c, 0x93, 0x86, 0x4c, 0x93, 0xff, 0x2d, 0x65, 0xe0, 0x9a, 0x34, 0x64, 0x9a, 0xfc, 0x1f,
-	0x29, 0x03, 0xd7, 0xa4, 0x21, 0xd3, 0xe4, 0xff, 0x4a, 0x19, 0xb8, 0x26, 0x0d, 0x99, 0x26, 0x7f,
-	0x24, 0x65, 0xe0, 0x9a, 0x34, 0x64, 0x9a, 0xfc, 0xb1, 0x94, 0x81, 0x6b, 0xd2, 0x90, 0x69, 0xf2,
-	0x27, 0x52, 0x06, 0xae, 0x49, 0x43, 0xa6, 0xc9, 0x9f, 0x4a, 0x19, 0xb8, 0x26, 0xd7, 0x64, 0x9a,
-	0xfc, 0x3f, 0x19, 0xc3, 0xda, 0xca, 0xdd, 0xeb, 0x8f, 0x5f, 0xee, 0xf6, 0xdc, 0x83, 0xc9, 0xde,
-	0xf2, 0xbe, 0x33, 0xb8, 0xd1, 0x75, 0xba, 0xce, 0x0d, 0x04, 0xed, 0x4d, 0x3a, 0xec, 0xe1, 0x46,
-	0x60, 0xf8, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x8c, 0xca, 0xed, 0x85, 0x3d, 0x00, 0x00,
+	0x7a, 0xd7, 0x0c, 0xee, 0x0f, 0x20, 0x31, 0x6c, 0xd1, 0x12, 0x44, 0x5d, 0x23, 0xac, 0xbd, 0x86,
+	0x25, 0x9b, 0x22, 0x81, 0x21, 0x24, 0xc1, 0xb1, 0xcb, 0x3a, 0x08, 0x8a, 0x25, 0x91, 0x90, 0x87,
+	0xb4, 0x9d, 0x55, 0x1e, 0x50, 0x20, 0x31, 0x00, 0xb1, 0x02, 0x66, 0x60, 0x60, 0x10, 0x91, 0x49,
+	0xa5, 0xca, 0x8f, 0xa9, 0xca, 0x53, 0x36, 0x49, 0x55, 0xde, 0xf3, 0x92, 0x97, 0x5c, 0x0f, 0xc9,
+	0xdf, 0x10, 0x5f, 0x7b, 0x79, 0xaf, 0x24, 0x9b, 0x6c, 0xee, 0x3b, 0x9b, 0x7b, 0x8f, 0xbc, 0x38,
+	0xd5, 0x5f, 0xf7, 0xcc, 0xf4, 0x0c, 0xa0, 0x16, 0xf9, 0x84, 0x99, 0xee, 0xdf, 0xf7, 0xeb, 0xeb,
+	0xd7, 0xdf, 0xf7, 0x75, 0x63, 0x00, 0x5c, 0x6b, 0xec, 0x2e, 0x0f, 0x47, 0x8e, 0xeb, 0x10, 0x7c,
+	0x6e, 0xe2, 0x73, 0xf1, 0x1a, 0x24, 0x37, 0x9c, 0x75, 0x7b, 0x32, 0x20, 0x57, 0x20, 0xd6, 0x71,
+	0x9c, 0x82, 0xa2, 0xab, 0xa5, 0xf9, 0x72, 0x7e, 0x39, 0xc0, 0x2c, 0xd7, 0x1b, 0x0d, 0x93, 0xd6,
+	0x15, 0x6f, 0x40, 0x76, 0xc3, 0xd9, 0xb5, 0xc6, 0x6e, 0xbd, 0x67, 0xf5, 0xdb, 0x64, 0x11, 0x12,
+	0x0f, 0x5b, 0x7b, 0x56, 0x1f, 0x6d, 0x32, 0x26, 0x7b, 0x21, 0x04, 0xe2, 0xbb, 0x47, 0x43, 0xab,
+	0xa0, 0x62, 0x21, 0x3e, 0x17, 0xff, 0xb0, 0x48, 0x9b, 0xa1, 0x96, 0xe4, 0x1a, 0xc4, 0x1f, 0xf4,
+	0xec, 0x36, 0x6f, 0xe7, 0xac, 0xd8, 0x0e, 0x43, 0x2c, 0x3f, 0xd8, 0xdc, 0xbe, 0x67, 0x22, 0x88,
+	0xb6, 0xb0, 0xdb, 0xda, 0xeb, 0x53, 0x32, 0x85, 0xb6, 0x80, 0x2f, 0xb4, 0xf4, 0x51, 0x6b, 0xd4,
+	0x1a, 0x14, 0x62, 0xba, 0x52, 0x4a, 0x98, 0xec, 0x85, 0xbc, 0x01, 0x73, 0xa6, 0xf5, 0xfe, 0xa4,
+	0x37, 0xb2, 0xda, 0xd8, 0xbd, 0x42, 0x5c, 0x57, 0x4b, 0xd9, 0x59, 0x2d, 0x60, 0xb5, 0x19, 0x46,
+	0x33, 0xf3, 0xa1, 0xd5, 0x72, 0x3d, 0xf3, 0x84, 0x1e, 0x7b, 0x8e, 0xb9, 0x80, 0xa6, 0xe6, 0x8d,
+	0xa1, 0xdb, 0x73, 0xec, 0x56, 0x9f, 0x99, 0x27, 0x75, 0x45, 0x6a, 0x1e, 0x42, 0x93, 0x2f, 0x42,
+	0xbe, 0xde, 0xbc, 0xe3, 0x38, 0xfd, 0xe6, 0x88, 0xf7, 0xaa, 0x00, 0xba, 0x5a, 0x4a, 0x9b, 0x73,
+	0x75, 0x5a, 0xea, 0x75, 0x95, 0x94, 0x40, 0xab, 0x37, 0x37, 0x6d, 0xb7, 0x52, 0x0e, 0x80, 0x59,
+	0x5d, 0x2d, 0x25, 0xcc, 0xf9, 0x3a, 0x16, 0x4f, 0x21, 0xab, 0x46, 0x80, 0xcc, 0xe9, 0x6a, 0x29,
+	0xc6, 0x90, 0x55, 0xc3, 0x47, 0xbe, 0x0a, 0xa4, 0xde, 0xac, 0xf7, 0x0e, 0xad, 0xb6, 0xc8, 0x3a,
+	0xa7, 0xab, 0xa5, 0x94, 0xa9, 0xd5, 0x79, 0xc5, 0x0c, 0xb4, 0xc8, 0x3c, 0xaf, 0xab, 0xa5, 0xa4,
+	0x87, 0x16, 0xb8, 0xaf, 0xc2, 0x42, 0xbd, 0xf9, 0x4e, 0x2f, 0xdc, 0xe1, 0xbc, 0xae, 0x96, 0xe6,
+	0xcc, 0x7c, 0x9d, 0x95, 0x4f, 0x63, 0x45, 0x62, 0x4d, 0x57, 0x4b, 0x71, 0x8e, 0x15, 0x78, 0x71,
+	0x74, 0xf5, 0xbe, 0xd3, 0x72, 0x03, 0xe8, 0x82, 0xae, 0x96, 0x54, 0x73, 0xbe, 0x8e, 0xc5, 0x61,
+	0xd6, 0x7b, 0xce, 0x64, 0xaf, 0x6f, 0x05, 0x50, 0xa2, 0xab, 0x25, 0xc5, 0xcc, 0xd7, 0x59, 0x79,
+	0x18, 0xbb, 0xe3, 0x8e, 0x7a, 0x76, 0x37, 0xc0, 0x9e, 0x46, 0x1d, 0xe7, 0xeb, 0xac, 0x3c, 0xdc,
+	0x83, 0x3b, 0x47, 0xae, 0x35, 0x0e, 0xa0, 0x96, 0xae, 0x96, 0x72, 0xe6, 0x7c, 0x1d, 0x8b, 0x23,
+	0xac, 0x91, 0x39, 0xe8, 0xe8, 0x6a, 0x69, 0x81, 0xb2, 0xce, 0x98, 0x83, 0x9d, 0xc8, 0x1c, 0x74,
+	0x75, 0xb5, 0x44, 0x38, 0x56, 0x98, 0x83, 0x65, 0x38, 0x5d, 0x6f, 0xee, 0x74, 0xa2, 0x0b, 0x77,
+	0xa0, 0xab, 0xa5, 0xbc, 0xb9, 0x50, 0xf7, 0x6a, 0x66, 0xe1, 0x45, 0xf6, 0x9e, 0xae, 0x96, 0x34,
+	0x1f, 0x2f, 0xf0, 0x8b, 0x9a, 0x64, 0x52, 0x2f, 0x2c, 0xea, 0x31, 0x41, 0x93, 0xac, 0x30, 0xac,
+	0x49, 0x0e, 0x7c, 0x41, 0x8f, 0x89, 0x9a, 0x8c, 0x20, 0xb1, 0x79, 0x8e, 0x3c, 0xa3, 0xc7, 0x44,
+	0x4d, 0x72, 0x64, 0x44, 0x93, 0x1c, 0x7b, 0x56, 0x8f, 0x85, 0x35, 0x39, 0x85, 0x16, 0x99, 0x0b,
+	0x7a, 0x2c, 0xac, 0x49, 0x8e, 0x0e, 0x6b, 0x92, 0x83, 0xcf, 0xe9, 0xb1, 0x90, 0x26, 0xa3, 0x58,
+	0x91, 0x78, 0x49, 0x8f, 0x85, 0x34, 0x29, 0x8e, 0xce, 0xd3, 0x24, 0x87, 0x9e, 0xd7, 0x63, 0xa2,
+	0x26, 0x45, 0x56, 0x5f, 0x93, 0x1c, 0x7a, 0x41, 0x8f, 0x85, 0x34, 0x29, 0x62, 0x7d, 0x4d, 0x72,
+	0xec, 0x45, 0x3d, 0x16, 0xd2, 0x24, 0xc7, 0xbe, 0x22, 0x6a, 0x92, 0x43, 0x3f, 0x54, 0xf4, 0x98,
+	0x28, 0x4a, 0x0e, 0xbd, 0x16, 0x12, 0x25, 0xc7, 0x7e, 0x44, 0xb1, 0xa2, 0x2a, 0xa3, 0x60, 0x71,
+	0x16, 0x3e, 0xa6, 0x60, 0x51, 0x96, 0x1c, 0x7c, 0x3d, 0x22, 0x4b, 0x0e, 0xff, 0x84, 0xc2, 0xc3,
+	0xba, 0x9c, 0x36, 0x10, 0xf9, 0x3f, 0xa5, 0x06, 0x61, 0x61, 0x72, 0x83, 0x40, 0x98, 0x0e, 0x77,
+	0xa2, 0x85, 0x4b, 0xba, 0xe2, 0x0b, 0xd3, 0xf3, 0xac, 0xa2, 0x30, 0x7d, 0xe0, 0x65, 0x0c, 0x19,
+	0x5c, 0x98, 0x53, 0xc8, 0xaa, 0x11, 0x20, 0x75, 0x5d, 0x09, 0x84, 0xe9, 0x23, 0x43, 0xc2, 0xf4,
+	0xb1, 0x57, 0x74, 0x45, 0x14, 0xe6, 0x0c, 0xb4, 0xc8, 0x5c, 0xd4, 0x15, 0x51, 0x98, 0x3e, 0x5a,
+	0x14, 0xa6, 0x0f, 0xfe, 0x82, 0xae, 0x08, 0xc2, 0x9c, 0xc6, 0x8a, 0xc4, 0x2f, 0xea, 0x8a, 0x20,
+	0xcc, 0xf0, 0xe8, 0x98, 0x30, 0x7d, 0xe8, 0x4b, 0xba, 0x12, 0x08, 0x33, 0xcc, 0xca, 0x85, 0xe9,
+	0x43, 0xbf, 0xa8, 0x2b, 0x82, 0x30, 0xc3, 0x58, 0x2e, 0x4c, 0x1f, 0xfb, 0x32, 0xc6, 0x69, 0x4f,
+	0x98, 0x3e, 0x56, 0x10, 0xa6, 0x0f, 0xfd, 0x1d, 0x1a, 0xd3, 0x7d, 0x61, 0xfa, 0x50, 0x51, 0x98,
+	0x3e, 0xf6, 0x77, 0x29, 0x36, 0x10, 0xe6, 0x34, 0x58, 0x9c, 0x85, 0xdf, 0xa3, 0xe0, 0x40, 0x98,
+	0x3e, 0x38, 0x2c, 0x4c, 0x1f, 0xfe, 0xfb, 0x14, 0x2e, 0x0a, 0x73, 0x96, 0x81, 0xc8, 0xff, 0x07,
+	0xd4, 0x40, 0x14, 0xa6, 0x6f, 0xb0, 0x8c, 0xc3, 0xa4, 0xc2, 0x6c, 0x5b, 0x9d, 0xd6, 0xa4, 0x4f,
+	0x65, 0x5c, 0xa2, 0xca, 0xac, 0xc5, 0xdd, 0xd1, 0xc4, 0xa2, 0x63, 0x75, 0x9c, 0xfe, 0x3d, 0xaf,
+	0x8e, 0x2c, 0xd3, 0xee, 0x33, 0x81, 0x06, 0x06, 0xaf, 0x50, 0x85, 0xd6, 0xd4, 0x4a, 0xd9, 0xcc,
+	0x33, 0x95, 0x4e, 0xe3, 0xab, 0x86, 0x80, 0xbf, 0x4a, 0x75, 0x5a, 0x53, 0xab, 0x06, 0xc3, 0x57,
+	0x8d, 0x00, 0x5f, 0xa1, 0x03, 0xf0, 0xc4, 0x1a, 0x58, 0x5c, 0xa3, 0x6a, 0xad, 0xc5, 0x2a, 0xe5,
+	0x15, 0x73, 0xc1, 0x93, 0xec, 0x2c, 0xa3, 0x50, 0x33, 0xaf, 0x52, 0xd1, 0xd6, 0x62, 0x55, 0xc3,
+	0x37, 0x12, 0x5b, 0x2a, 0x53, 0xa1, 0x73, 0xe9, 0x06, 0x36, 0xaf, 0x51, 0xed, 0xd6, 0xe2, 0x95,
+	0xf2, 0xca, 0x8a, 0xa9, 0x71, 0x05, 0xcf, 0xb0, 0x09, 0xb5, 0xb3, 0x4c, 0x35, 0x5c, 0x8b, 0x57,
+	0x0d, 0xdf, 0x26, 0xdc, 0xce, 0x82, 0x27, 0xe5, 0xc0, 0xe4, 0x3a, 0xd5, 0x72, 0x2d, 0x59, 0x59,
+	0x35, 0x56, 0xd7, 0x6e, 0x99, 0x79, 0xa6, 0xe9, 0xc0, 0xc6, 0xa0, 0xed, 0x70, 0x51, 0x07, 0x46,
+	0x2b, 0x54, 0xd5, 0xb5, 0x64, 0xf9, 0xc6, 0xea, 0xcd, 0xf2, 0x4d, 0x53, 0xe3, 0xea, 0x0e, 0xac,
+	0xde, 0xa4, 0x56, 0x5c, 0xde, 0x81, 0xd5, 0x2a, 0xd5, 0x77, 0x4d, 0x3b, 0xb0, 0xfa, 0x7d, 0xe7,
+	0x55, 0xbd, 0xf8, 0xd4, 0x19, 0xf5, 0xdb, 0x57, 0x8a, 0x60, 0x6a, 0x5c, 0xf1, 0x62, 0xab, 0x0b,
+	0x9e, 0xe4, 0x03, 0xf3, 0x5f, 0xa5, 0x19, 0x6b, 0xae, 0x96, 0xba, 0xd3, 0xeb, 0xda, 0xce, 0xd8,
+	0x32, 0xf3, 0x4c, 0xfc, 0x91, 0x39, 0xd9, 0x89, 0xce, 0xe3, 0x57, 0xa8, 0xd9, 0x42, 0x2d, 0xf6,
+	0x5a, 0xa5, 0x4c, 0x5b, 0x9a, 0x35, 0x8f, 0x3b, 0xd1, 0x79, 0xfc, 0x35, 0x6a, 0x43, 0x6a, 0xb1,
+	0xd7, 0xaa, 0x06, 0xb7, 0x11, 0xe7, 0xb1, 0x0a, 0x8b, 0xc2, 0x5e, 0x08, 0xac, 0x7e, 0x9d, 0x5a,
+	0xe5, 0x59, 0x4b, 0xc4, 0xdf, 0x11, 0x33, 0xed, 0x42, 0xad, 0xfd, 0x06, 0xb5, 0xd3, 0x58, 0x6b,
+	0xc4, 0xdf, 0x18, 0x81, 0xdd, 0x0d, 0x38, 0x13, 0xc9, 0x25, 0x9a, 0xc3, 0xd6, 0xfe, 0x13, 0xab,
+	0x5d, 0x28, 0xd3, 0x94, 0xe2, 0x8e, 0xaa, 0x29, 0xe6, 0xe9, 0x50, 0x5a, 0xf1, 0x08, 0xab, 0xc9,
+	0x2d, 0x38, 0x1b, 0x4d, 0x2e, 0x3c, 0xcb, 0x0a, 0xcd, 0x31, 0xd0, 0x72, 0x31, 0x9c, 0x67, 0x44,
+	0x4c, 0x85, 0xa0, 0xe2, 0x99, 0x1a, 0x34, 0xe9, 0x08, 0x4c, 0x83, 0xd8, 0xc2, 0x4d, 0xdf, 0x80,
+	0x73, 0xd3, 0xe9, 0x87, 0x67, 0xbc, 0x46, 0xb3, 0x10, 0x34, 0x3e, 0x13, 0xcd, 0x44, 0xa6, 0xcc,
+	0x67, 0xb4, 0x5d, 0xa5, 0x69, 0x89, 0x68, 0x3e, 0xd5, 0xfa, 0xeb, 0x50, 0x98, 0x4a, 0x50, 0x3c,
+	0xeb, 0x1b, 0x34, 0x4f, 0x41, 0xeb, 0x17, 0x22, 0xb9, 0x4a, 0xd4, 0x78, 0x46, 0xd3, 0x37, 0x69,
+	0xe2, 0x22, 0x18, 0x4f, 0xb5, 0x8c, 0x53, 0x16, 0x4e, 0x61, 0x3c, 0xdb, 0x5b, 0x34, 0x93, 0xe1,
+	0x53, 0x16, 0xca, 0x66, 0xc4, 0x76, 0x23, 0x39, 0x8d, 0x67, 0x5b, 0xa3, 0xa9, 0x0d, 0x6f, 0x37,
+	0x9c, 0xde, 0x70, 0xe3, 0x9f, 0xa1, 0xc6, 0x3b, 0xb3, 0x47, 0xfc, 0xa3, 0x18, 0x4d, 0x4a, 0xb8,
+	0xf5, 0xce, 0xac, 0x21, 0xfb, 0xd6, 0x33, 0x86, 0xfc, 0x63, 0x6a, 0x4d, 0x04, 0xeb, 0xa9, 0x31,
+	0xbf, 0x05, 0x4b, 0x33, 0xf2, 0x15, 0xcf, 0xfe, 0x27, 0xd4, 0x3e, 0x8f, 0xf6, 0x67, 0xa7, 0x52,
+	0x97, 0x69, 0x86, 0x19, 0x3d, 0xf8, 0x29, 0x65, 0xd0, 0x42, 0x0c, 0x53, 0x7d, 0xa8, 0xc3, 0x9c,
+	0x97, 0x8f, 0x77, 0x47, 0xce, 0x64, 0x58, 0xa8, 0xeb, 0x6a, 0x09, 0xca, 0xfa, 0x8c, 0xd3, 0xb1,
+	0x97, 0x9e, 0x6f, 0x50, 0x9c, 0x19, 0x36, 0x63, 0x3c, 0x8c, 0x99, 0xf1, 0x3c, 0xd2, 0x63, 0xcf,
+	0xe4, 0x61, 0x38, 0x9f, 0x47, 0x30, 0xa3, 0x3c, 0x5e, 0xb8, 0x63, 0x3c, 0x8f, 0x75, 0xe5, 0x19,
+	0x3c, 0x5e, 0xf0, 0xe3, 0x3c, 0x21, 0xb3, 0xa5, 0xb5, 0xe0, 0x4c, 0x8e, 0xf5, 0xe4, 0xc5, 0xe8,
+	0x21, 0x7d, 0x03, 0x4f, 0x57, 0xe1, 0x42, 0x66, 0x26, 0x74, 0x6f, 0xda, 0xec, 0xed, 0x67, 0x98,
+	0x85, 0x7a, 0x33, 0x6d, 0xf6, 0x73, 0x33, 0xcc, 0x8a, 0xbf, 0xa9, 0x40, 0xfc, 0xc1, 0xe6, 0xf6,
+	0x3d, 0x92, 0x86, 0xf8, 0xbb, 0x8d, 0xcd, 0x7b, 0xda, 0x29, 0xfa, 0x74, 0xa7, 0xd1, 0x78, 0xa8,
+	0x29, 0x24, 0x03, 0x89, 0x3b, 0x5f, 0xda, 0x5d, 0xdf, 0xd1, 0x54, 0x92, 0x87, 0x6c, 0x7d, 0x73,
+	0x7b, 0x63, 0xdd, 0x7c, 0x64, 0x6e, 0x6e, 0xef, 0x6a, 0x31, 0x5a, 0x57, 0x7f, 0xd8, 0xb8, 0xbd,
+	0xab, 0xc5, 0x49, 0x0a, 0x62, 0xb4, 0x2c, 0x41, 0x00, 0x92, 0x3b, 0xbb, 0xe6, 0xe6, 0xf6, 0x86,
+	0x96, 0xa4, 0x2c, 0xbb, 0x9b, 0x5b, 0xeb, 0x5a, 0x8a, 0x22, 0x77, 0xdf, 0x79, 0xf4, 0x70, 0x5d,
+	0x4b, 0xd3, 0xc7, 0xdb, 0xa6, 0x79, 0xfb, 0x4b, 0x5a, 0x86, 0x1a, 0x6d, 0xdd, 0x7e, 0xa4, 0x01,
+	0x56, 0xdf, 0xbe, 0xf3, 0x70, 0x5d, 0xcb, 0x92, 0x1c, 0xa4, 0xeb, 0xef, 0x6c, 0xdf, 0xdd, 0xdd,
+	0x6c, 0x6c, 0x6b, 0xb9, 0xe2, 0x2f, 0x42, 0x81, 0x4d, 0x73, 0x68, 0x16, 0xd9, 0x95, 0xc1, 0x5b,
+	0x90, 0x60, 0x6b, 0xa3, 0xa0, 0x56, 0xae, 0x4e, 0xaf, 0xcd, 0xb4, 0xd1, 0x32, 0x5b, 0x25, 0x66,
+	0xb8, 0x74, 0x11, 0x12, 0x6c, 0x9e, 0x16, 0x21, 0xc1, 0xe6, 0x47, 0xc5, 0xab, 0x04, 0xf6, 0x52,
+	0xfc, 0x2d, 0x15, 0x60, 0xc3, 0xd9, 0x79, 0xd2, 0x1b, 0xe2, 0xc5, 0xcd, 0x45, 0x80, 0xf1, 0x93,
+	0xde, 0xb0, 0x89, 0x3b, 0x90, 0x5f, 0x3a, 0x64, 0x68, 0x09, 0xfa, 0x5e, 0x72, 0x05, 0x72, 0x58,
+	0xcd, 0xb7, 0x08, 0xde, 0x35, 0xa4, 0xcc, 0x2c, 0x2d, 0xe3, 0x4e, 0x32, 0x0c, 0xa9, 0x1a, 0x78,
+	0xc5, 0x90, 0x14, 0x20, 0x55, 0x83, 0x5c, 0x06, 0x7c, 0x6d, 0x8e, 0x31, 0x9a, 0xe2, 0xb5, 0x42,
+	0xc6, 0xc4, 0x76, 0x59, 0x7c, 0x25, 0x6f, 0x02, 0xb6, 0xc9, 0x46, 0x9e, 0x9f, 0xb5, 0x4b, 0xbc,
+	0x0e, 0x2f, 0xd3, 0x07, 0x36, 0xde, 0xc0, 0x64, 0xa9, 0x01, 0x19, 0xbf, 0x9c, 0xb6, 0x86, 0xa5,
+	0x7c, 0x4c, 0x1a, 0x8e, 0x09, 0xb0, 0xc8, 0x1f, 0x14, 0x03, 0xf0, 0xfe, 0x2c, 0x60, 0x7f, 0x98,
+	0x11, 0xeb, 0x50, 0xf1, 0x22, 0xcc, 0x6d, 0x3b, 0x36, 0xdb, 0xc7, 0x38, 0x4f, 0x39, 0x50, 0x5a,
+	0x05, 0x05, 0xcf, 0xbf, 0x4a, 0xab, 0x78, 0x09, 0x40, 0xa8, 0xd3, 0x40, 0xd9, 0x63, 0x75, 0xe8,
+	0x0f, 0x94, 0xbd, 0xe2, 0x35, 0x48, 0x6e, 0xb5, 0x0e, 0x77, 0x5b, 0x5d, 0x72, 0x05, 0xa0, 0xdf,
+	0x1a, 0xbb, 0xcd, 0x0e, 0xae, 0xc4, 0xe7, 0x9f, 0x7f, 0xfe, 0xb9, 0x82, 0xc9, 0x74, 0x86, 0x96,
+	0xb2, 0x15, 0x19, 0x03, 0x34, 0xfa, 0xed, 0x2d, 0x6b, 0x3c, 0x6e, 0x75, 0x2d, 0xb2, 0x06, 0x49,
+	0xdb, 0x1a, 0xd3, 0xe8, 0xab, 0xe0, 0x5d, 0xd3, 0x45, 0x71, 0x1e, 0x02, 0xdc, 0xf2, 0x36, 0x82,
+	0x4c, 0x0e, 0x26, 0x1a, 0xc4, 0xec, 0xc9, 0x00, 0x6f, 0xd4, 0x12, 0x26, 0x7d, 0x5c, 0xba, 0x00,
+	0x49, 0x86, 0x21, 0x04, 0xe2, 0x76, 0x6b, 0x60, 0x15, 0x58, 0xcb, 0xf8, 0x5c, 0xfc, 0x8a, 0x02,
+	0xb0, 0x6d, 0x3d, 0x3d, 0x56, 0xab, 0x01, 0x4e, 0xd2, 0x6a, 0x8c, 0xb5, 0xfa, 0xba, 0xac, 0x55,
+	0xaa, 0xb6, 0x8e, 0xe3, 0xb4, 0x9b, 0x6c, 0xa1, 0xd9, 0xf5, 0x5f, 0x86, 0x96, 0xe0, 0xca, 0x15,
+	0x1f, 0x43, 0x6e, 0xd3, 0xb6, 0xad, 0x91, 0xd7, 0x2b, 0x02, 0xf1, 0x03, 0x67, 0xec, 0xf2, 0x9b,
+	0x48, 0x7c, 0x26, 0x05, 0x88, 0x0f, 0x9d, 0x91, 0xcb, 0x46, 0x5a, 0x8b, 0x1b, 0x2b, 0x2b, 0x2b,
+	0x26, 0x96, 0x90, 0x0b, 0x90, 0xd9, 0x77, 0x6c, 0xdb, 0xda, 0xa7, 0xc3, 0x88, 0xe1, 0xd1, 0x31,
+	0x28, 0x28, 0xfe, 0xb2, 0x02, 0xb9, 0x86, 0x7b, 0x10, 0x90, 0x6b, 0x10, 0x7b, 0x62, 0x1d, 0x61,
+	0xf7, 0x62, 0x26, 0x7d, 0xa4, 0x1b, 0xe6, 0xe7, 0x5b, 0xfd, 0x09, 0xbb, 0x97, 0xcc, 0x99, 0xec,
+	0x85, 0x9c, 0x81, 0xe4, 0x53, 0xab, 0xd7, 0x3d, 0x70, 0x91, 0x53, 0x35, 0xf9, 0x1b, 0x59, 0x86,
+	0x44, 0x8f, 0x76, 0xb6, 0x10, 0xc7, 0x19, 0x2b, 0x88, 0x33, 0x26, 0x8e, 0xc2, 0x64, 0xb0, 0xab,
+	0xe9, 0x74, 0x5b, 0xfb, 0xe0, 0x83, 0x0f, 0x3e, 0x50, 0x8b, 0x07, 0xb0, 0xe8, 0x6d, 0xe2, 0xd0,
+	0x70, 0x1f, 0x41, 0xa1, 0x6f, 0x39, 0xcd, 0x4e, 0xcf, 0x6e, 0xf5, 0xfb, 0x47, 0xcd, 0xa7, 0x8e,
+	0xdd, 0x6c, 0xd9, 0x4d, 0x67, 0xbc, 0xdf, 0x1a, 0xe1, 0x14, 0xc8, 0x1a, 0x59, 0xec, 0x5b, 0x4e,
+	0x9d, 0x19, 0xbe, 0xe7, 0xd8, 0xb7, 0xed, 0x06, 0xb5, 0x2a, 0x7e, 0x16, 0x87, 0xcc, 0xd6, 0x91,
+	0xc7, 0xbf, 0x08, 0x89, 0x7d, 0x67, 0x62, 0xb3, 0xf9, 0x4c, 0x98, 0xec, 0xc5, 0x5f, 0x27, 0x55,
+	0x58, 0xa7, 0x45, 0x48, 0xbc, 0x3f, 0x71, 0x5c, 0x0b, 0x87, 0x9c, 0x31, 0xd9, 0x0b, 0x9d, 0xb1,
+	0xa1, 0xe5, 0x16, 0xe2, 0x78, 0x4d, 0x41, 0x1f, 0x83, 0x39, 0x48, 0x1c, 0x6b, 0x0e, 0xc8, 0x0a,
+	0x24, 0x1d, 0xba, 0x06, 0xe3, 0x42, 0x12, 0xef, 0x61, 0x43, 0x06, 0xe2, 0xea, 0x98, 0x1c, 0x47,
+	0x1e, 0xc0, 0xc2, 0x53, 0xab, 0x39, 0x98, 0x8c, 0xdd, 0x66, 0xd7, 0x69, 0xb6, 0x2d, 0x6b, 0x68,
+	0x8d, 0x0a, 0x73, 0xd8, 0x5a, 0xc8, 0x43, 0xcc, 0x9a, 0x50, 0x73, 0xfe, 0xa9, 0xb5, 0x35, 0x19,
+	0xbb, 0x1b, 0xce, 0x3d, 0xb4, 0x23, 0x6b, 0x90, 0x19, 0x59, 0xd4, 0x2f, 0xd0, 0x2e, 0xe7, 0xa6,
+	0x7b, 0x10, 0x32, 0x4e, 0x8f, 0xac, 0x21, 0x16, 0x90, 0x1b, 0x90, 0xde, 0xeb, 0x3d, 0xb1, 0xc6,
+	0x07, 0x56, 0xbb, 0x90, 0xd2, 0x95, 0xd2, 0x7c, 0xf9, 0xbc, 0x68, 0xe5, 0x4f, 0xf0, 0xf2, 0x5d,
+	0xa7, 0xef, 0x8c, 0x4c, 0x1f, 0x4c, 0xde, 0x80, 0xcc, 0xd8, 0x19, 0x58, 0x4c, 0xed, 0x69, 0x0c,
+	0xb6, 0x97, 0x67, 0x5b, 0xee, 0x38, 0x03, 0xcb, 0xf3, 0x6a, 0x9e, 0x05, 0x39, 0xcf, 0xba, 0xbb,
+	0x47, 0x0f, 0x13, 0x05, 0xc0, 0x0b, 0x1f, 0xda, 0x29, 0x3c, 0x5c, 0x90, 0x25, 0xda, 0xa9, 0x6e,
+	0x87, 0xe6, 0x6c, 0x85, 0x2c, 0x9e, 0xe5, 0xfd, 0xf7, 0xa5, 0x57, 0x21, 0xe3, 0x13, 0x06, 0xee,
+	0x90, 0xb9, 0xa0, 0x0c, 0x7a, 0x08, 0xe6, 0x0e, 0x99, 0xff, 0x79, 0x09, 0x12, 0xd8, 0x71, 0x1a,
+	0xb9, 0xcc, 0x75, 0x1a, 0x28, 0x33, 0x90, 0xd8, 0x30, 0xd7, 0xd7, 0xb7, 0x35, 0x05, 0x63, 0xe6,
+	0xc3, 0x77, 0xd6, 0x35, 0x55, 0xd0, 0xef, 0x6f, 0xab, 0x10, 0x5b, 0x3f, 0x44, 0xe5, 0xb4, 0x5b,
+	0x6e, 0xcb, 0xdb, 0xe1, 0xf4, 0x99, 0xd4, 0x20, 0x33, 0x68, 0x79, 0x6d, 0xa9, 0x38, 0xc5, 0x21,
+	0x5f, 0xb2, 0x7e, 0xe8, 0x2e, 0x6f, 0xb5, 0x58, 0xcb, 0xeb, 0xb6, 0x3b, 0x3a, 0x32, 0xd3, 0x03,
+	0xfe, 0xba, 0xf4, 0x3a, 0xcc, 0x85, 0xaa, 0xc4, 0x2d, 0x9a, 0x98, 0xb1, 0x45, 0x13, 0x7c, 0x8b,
+	0xd6, 0xd4, 0x9b, 0x4a, 0xb9, 0x06, 0xf1, 0x81, 0x33, 0xb2, 0xc8, 0x0b, 0x33, 0x27, 0xb8, 0xd0,
+	0x45, 0xc9, 0xe4, 0x23, 0x5d, 0x31, 0xd1, 0xa6, 0xfc, 0x0a, 0xc4, 0x5d, 0xeb, 0xd0, 0x7d, 0x96,
+	0xed, 0x01, 0x1b, 0x1f, 0x85, 0x94, 0x5f, 0x83, 0xa4, 0x3d, 0x19, 0xec, 0x59, 0xa3, 0x67, 0x81,
+	0x7b, 0xd8, 0x31, 0x0e, 0x2a, 0xbe, 0x0b, 0xda, 0x5d, 0x67, 0x30, 0xec, 0x5b, 0x87, 0xeb, 0x87,
+	0xae, 0x65, 0x8f, 0x7b, 0x8e, 0x4d, 0xc7, 0xd0, 0xe9, 0x8d, 0xd0, 0xad, 0xe1, 0x18, 0xf0, 0x85,
+	0xba, 0x99, 0xb1, 0xb5, 0xef, 0xd8, 0x6d, 0x3e, 0x34, 0xfe, 0x46, 0xd1, 0xee, 0x41, 0x6f, 0x44,
+	0x3d, 0x1a, 0x0d, 0x3e, 0xec, 0xa5, 0xb8, 0x01, 0x79, 0x7e, 0x0c, 0x1b, 0xf3, 0x86, 0x8b, 0x57,
+	0x21, 0xe7, 0x15, 0xe1, 0x3f, 0x3f, 0x69, 0x88, 0x3f, 0x5e, 0x37, 0x1b, 0xda, 0x29, 0xba, 0xae,
+	0x8d, 0xed, 0x75, 0x4d, 0xa1, 0x0f, 0xbb, 0xef, 0x35, 0x42, 0x6b, 0x79, 0x01, 0x72, 0x7e, 0xdf,
+	0x77, 0x2c, 0x17, 0x6b, 0x68, 0x94, 0x4a, 0xd5, 0xd4, 0xb4, 0x52, 0x4c, 0x41, 0x62, 0x7d, 0x30,
+	0x74, 0x8f, 0x8a, 0xbf, 0x04, 0x59, 0x0e, 0x7a, 0xd8, 0x1b, 0xbb, 0xe4, 0x16, 0xa4, 0x06, 0x7c,
+	0xbc, 0x0a, 0xe6, 0xa2, 0x61, 0x59, 0x07, 0x48, 0xef, 0xd9, 0xf4, 0xf0, 0x4b, 0x15, 0x48, 0x09,
+	0xee, 0x9d, 0x7b, 0x1e, 0x55, 0xf4, 0x3c, 0xcc, 0x47, 0xc5, 0x04, 0x1f, 0x55, 0xdc, 0x82, 0x14,
+	0x0b, 0xcc, 0x63, 0x4c, 0x37, 0xd8, 0xf9, 0x9d, 0x69, 0x8c, 0x89, 0x2f, 0xcb, 0xca, 0x58, 0x0e,
+	0x75, 0x19, 0xb2, 0xb8, 0x67, 0x7c, 0x15, 0x52, 0x6f, 0x0e, 0x58, 0xc4, 0x14, 0xff, 0x47, 0x09,
+	0x48, 0x7b, 0x73, 0x45, 0xce, 0x43, 0x92, 0x1d, 0x62, 0x91, 0xca, 0xbb, 0xd4, 0x49, 0xe0, 0xb1,
+	0x95, 0x9c, 0x87, 0x14, 0x3f, 0xa8, 0xf2, 0x80, 0xa3, 0x56, 0xca, 0x66, 0x92, 0x1d, 0x4c, 0xfd,
+	0xca, 0xaa, 0x81, 0x7e, 0x92, 0x5d, 0xd7, 0x24, 0xd9, 0xd1, 0x93, 0xe8, 0x90, 0xf1, 0x0f, 0x9b,
+	0x18, 0x22, 0xf8, 0xdd, 0x4c, 0xda, 0x3b, 0x5d, 0x0a, 0x88, 0xaa, 0x81, 0x0e, 0x94, 0x5f, 0xc4,
+	0xa4, 0xeb, 0x41, 0xde, 0x94, 0xf6, 0x8e, 0x8c, 0xf8, 0xcf, 0x93, 0x77, 0xeb, 0x92, 0xe2, 0x87,
+	0xc4, 0x00, 0x50, 0x35, 0xd0, 0x33, 0x79, 0x57, 0x2c, 0x29, 0x7e, 0x10, 0x24, 0x97, 0x69, 0x17,
+	0xf1, 0x60, 0x87, 0xfe, 0x27, 0xb8, 0x4f, 0x49, 0xb2, 0xe3, 0x1e, 0xb9, 0x42, 0x19, 0xd8, 0xe9,
+	0x0d, 0x5d, 0x43, 0x70, 0x79, 0x92, 0xe2, 0x87, 0x3a, 0x72, 0x8d, 0x42, 0xd8, 0xf4, 0x17, 0xe0,
+	0x19, 0x37, 0x25, 0x29, 0x7e, 0x53, 0x42, 0x74, 0xda, 0x20, 0x7a, 0x28, 0xf4, 0x4a, 0xc2, 0xad,
+	0x48, 0x92, 0xdd, 0x8a, 0x90, 0x4b, 0x48, 0xc7, 0x06, 0x95, 0x0b, 0x6e, 0x40, 0x52, 0xfc, 0x14,
+	0x18, 0xd4, 0x63, 0x2e, 0xe9, 0xdf, 0x76, 0xa4, 0xf8, 0x39, 0x8f, 0xdc, 0xa4, 0xeb, 0x45, 0x15,
+	0x5e, 0x98, 0x47, 0x5f, 0xbc, 0x24, 0x4a, 0xcf, 0x5b, 0x55, 0xe6, 0x8a, 0x6b, 0xcc, 0x8d, 0x99,
+	0x89, 0x3a, 0xee, 0x88, 0x25, 0x6a, 0xf9, 0xa8, 0x67, 0x77, 0x0a, 0x79, 0x9c, 0x8b, 0x58, 0xcf,
+	0xee, 0x98, 0x89, 0x3a, 0x2d, 0x61, 0x2a, 0xd8, 0xa6, 0x75, 0x1a, 0xd6, 0xc5, 0x5f, 0x63, 0x95,
+	0xb4, 0x88, 0x14, 0x20, 0x51, 0x6f, 0x6e, 0xb7, 0xec, 0xc2, 0x02, 0xb3, 0xb3, 0x5b, 0xb6, 0x19,
+	0xaf, 0x6f, 0xb7, 0x6c, 0xf2, 0x0a, 0xc4, 0xc6, 0x93, 0xbd, 0x02, 0x99, 0xfe, 0x5b, 0x70, 0x67,
+	0xb2, 0xe7, 0x75, 0xc6, 0xa4, 0x18, 0x72, 0x1e, 0xd2, 0x63, 0x77, 0xd4, 0xfc, 0x05, 0x6b, 0xe4,
+	0x14, 0x4e, 0xe3, 0x34, 0x9e, 0x32, 0x53, 0x63, 0x77, 0xf4, 0xd8, 0x1a, 0x39, 0xc7, 0xf4, 0xc1,
+	0xc5, 0x4b, 0x90, 0x15, 0x78, 0x49, 0x1e, 0x14, 0x9b, 0x25, 0x30, 0x35, 0xe5, 0x86, 0xa9, 0xd8,
+	0xc5, 0x77, 0x21, 0xe7, 0x1d, 0xb1, 0x70, 0xc4, 0x06, 0xdd, 0x4d, 0x7d, 0x67, 0x84, 0xbb, 0x74,
+	0xbe, 0x7c, 0x29, 0x1c, 0x31, 0x03, 0x20, 0x8f, 0x5c, 0x0c, 0x5c, 0xd4, 0x22, 0x9d, 0x51, 0x8a,
+	0x3f, 0x50, 0x20, 0xb7, 0xe5, 0x8c, 0x82, 0xff, 0x2f, 0x16, 0x21, 0xb1, 0xe7, 0x38, 0xfd, 0x31,
+	0x12, 0xa7, 0x4d, 0xf6, 0x42, 0x5e, 0x82, 0x1c, 0x3e, 0x78, 0x87, 0x64, 0xd5, 0xbf, 0x05, 0xca,
+	0x62, 0x39, 0x3f, 0x17, 0x13, 0x88, 0xf7, 0x6c, 0x77, 0xcc, 0x3d, 0x1a, 0x3e, 0x93, 0x2f, 0x40,
+	0x96, 0xfe, 0x7a, 0x96, 0x71, 0x3f, 0x9b, 0x06, 0x5a, 0xcc, 0x0d, 0x5f, 0x86, 0x39, 0xd4, 0x80,
+	0x0f, 0x4b, 0xf9, 0x37, 0x3e, 0x39, 0x56, 0xc1, 0x81, 0x05, 0x48, 0x31, 0x87, 0x30, 0xc6, 0x3f,
+	0x7c, 0x33, 0xa6, 0xf7, 0x4a, 0xdd, 0x2c, 0x1e, 0x54, 0x58, 0x06, 0x92, 0x32, 0xf9, 0x5b, 0xf1,
+	0x2e, 0xa4, 0x31, 0x5c, 0x36, 0xfa, 0x6d, 0xf2, 0x22, 0x28, 0xdd, 0x82, 0x85, 0xe1, 0xfa, 0x4c,
+	0xe8, 0x14, 0xc2, 0x01, 0xcb, 0x1b, 0xa6, 0xd2, 0x5d, 0x5a, 0x00, 0x65, 0x83, 0x1e, 0x0b, 0x0e,
+	0xb9, 0xc3, 0x56, 0x0e, 0x8b, 0x6f, 0x73, 0x92, 0x6d, 0xeb, 0xa9, 0x9c, 0x64, 0xdb, 0x7a, 0xca,
+	0x48, 0x2e, 0x4f, 0x91, 0xd0, 0xb7, 0x23, 0xfe, 0x1f, 0xb8, 0x72, 0x54, 0xac, 0xc0, 0x1c, 0x6e,
+	0xd4, 0x9e, 0xdd, 0x7d, 0xe4, 0xf4, 0x6c, 0x3c, 0x88, 0x74, 0x30, 0x81, 0x53, 0x4c, 0xa5, 0x43,
+	0xd7, 0xc1, 0x3a, 0x6c, 0xed, 0xb3, 0x74, 0x38, 0x6d, 0xb2, 0x97, 0xe2, 0xf7, 0xe3, 0x30, 0xcf,
+	0x9d, 0xec, 0x7b, 0x3d, 0xf7, 0x60, 0xab, 0x35, 0x24, 0xdb, 0x90, 0xa3, 0xfe, 0xb5, 0x39, 0x68,
+	0x0d, 0x87, 0x74, 0x23, 0x2b, 0x18, 0x9a, 0xaf, 0xcd, 0x70, 0xdb, 0xdc, 0x62, 0x79, 0xbb, 0x35,
+	0xb0, 0xb6, 0x18, 0x9a, 0x05, 0xea, 0xac, 0x1d, 0x94, 0x90, 0x07, 0x90, 0x1d, 0x8c, 0xbb, 0x3e,
+	0x1d, 0x8b, 0xf4, 0x57, 0x25, 0x74, 0x5b, 0xe3, 0x6e, 0x88, 0x0d, 0x06, 0x7e, 0x01, 0xed, 0x1c,
+	0xf5, 0xce, 0x3e, 0x5b, 0xec, 0xb9, 0x9d, 0xa3, 0xae, 0x24, 0xdc, 0xb9, 0xbd, 0xa0, 0x84, 0xd4,
+	0x01, 0xe8, 0x56, 0x73, 0x1d, 0x7a, 0xc2, 0x43, 0x2d, 0x65, 0xcb, 0x25, 0x09, 0xdb, 0x8e, 0x3b,
+	0xda, 0x75, 0x76, 0xdc, 0x11, 0x4f, 0x48, 0xc6, 0xfc, 0x75, 0xe9, 0x4d, 0xd0, 0xa2, 0xb3, 0xf0,
+	0xbc, 0x9c, 0x24, 0x23, 0xe4, 0x24, 0x4b, 0x3f, 0x0b, 0xf9, 0xc8, 0xb0, 0x45, 0x73, 0xc2, 0xcc,
+	0xaf, 0x8b, 0xe6, 0xd9, 0xf2, 0xb9, 0xd0, 0x37, 0x1a, 0xe2, 0xd2, 0x8b, 0xcc, 0x6f, 0x82, 0x16,
+	0x9d, 0x02, 0x91, 0x3a, 0x2d, 0x39, 0xd0, 0xa0, 0xfd, 0xeb, 0x30, 0x17, 0x1a, 0xb4, 0x68, 0x9c,
+	0x79, 0xce, 0xb0, 0x8a, 0xbf, 0x92, 0x80, 0x44, 0xc3, 0xb6, 0x9c, 0x0e, 0x39, 0x1b, 0x8e, 0x9d,
+	0xf7, 0x4f, 0x79, 0x71, 0xf3, 0x5c, 0x24, 0x6e, 0xde, 0x3f, 0xe5, 0x47, 0xcd, 0x73, 0x91, 0xa8,
+	0xe9, 0x55, 0x55, 0x0d, 0x72, 0x71, 0x2a, 0x66, 0xde, 0x3f, 0x25, 0x04, 0xcc, 0x8b, 0x53, 0x01,
+	0x33, 0xa8, 0xae, 0x1a, 0xd4, 0xc1, 0x86, 0xa3, 0xe5, 0xfd, 0x53, 0x41, 0xa4, 0x3c, 0x1f, 0x8d,
+	0x94, 0x7e, 0x65, 0xd5, 0x60, 0x5d, 0x12, 0xa2, 0x24, 0x76, 0x89, 0xc5, 0xc7, 0xf3, 0xd1, 0xf8,
+	0x88, 0x76, 0x3c, 0x32, 0x9e, 0x8f, 0x46, 0x46, 0xac, 0xe4, 0x91, 0xf0, 0x5c, 0x24, 0x12, 0x22,
+	0x29, 0x0b, 0x81, 0xe7, 0xa3, 0x21, 0x90, 0xd9, 0x09, 0x3d, 0x15, 0xe3, 0x9f, 0x5f, 0x59, 0x35,
+	0x88, 0x11, 0x09, 0x7e, 0xb2, 0x83, 0x08, 0xae, 0x06, 0x86, 0x81, 0x2a, 0x9d, 0x38, 0x2f, 0x41,
+	0xcd, 0x4b, 0x3f, 0x61, 0xc1, 0x19, 0xf5, 0x12, 0x34, 0x03, 0x52, 0x1d, 0x7e, 0x56, 0xd7, 0xd0,
+	0x93, 0x85, 0xc4, 0x89, 0x12, 0x58, 0xae, 0x37, 0xd1, 0xa3, 0xd1, 0xd1, 0x75, 0xd8, 0x81, 0xa3,
+	0x04, 0x73, 0xf5, 0xe6, 0xc3, 0xd6, 0xa8, 0x4b, 0xa1, 0xbb, 0xad, 0xae, 0x7f, 0xeb, 0x41, 0x55,
+	0x90, 0xad, 0xf3, 0x9a, 0xdd, 0x56, 0x97, 0x9c, 0xf1, 0x24, 0xd6, 0xc6, 0x5a, 0x85, 0x8b, 0x6c,
+	0xe9, 0x2c, 0x9d, 0x3a, 0x46, 0x86, 0xbe, 0x71, 0x81, 0xfb, 0xc6, 0x3b, 0x29, 0x48, 0x4c, 0xec,
+	0x9e, 0x63, 0xdf, 0xc9, 0x40, 0xca, 0x75, 0x46, 0x83, 0x96, 0xeb, 0x14, 0x7f, 0xa8, 0x00, 0xdc,
+	0x75, 0x06, 0x83, 0x89, 0xdd, 0x7b, 0x7f, 0x62, 0x91, 0x4b, 0x90, 0x1d, 0xb4, 0x9e, 0x58, 0xcd,
+	0x81, 0xd5, 0xdc, 0x1f, 0x79, 0xbb, 0x21, 0x43, 0x8b, 0xb6, 0xac, 0xbb, 0xa3, 0x23, 0x52, 0xf0,
+	0x12, 0x78, 0x54, 0x10, 0x0a, 0x93, 0x27, 0xf4, 0x8b, 0x3c, 0x1d, 0x4d, 0xf2, 0x95, 0xf4, 0x12,
+	0x52, 0x76, 0xc8, 0x49, 0xf1, 0x35, 0x64, 0xc7, 0x9c, 0xb3, 0x90, 0x74, 0xad, 0xc1, 0xb0, 0xb9,
+	0x8f, 0x82, 0xa1, 0xa2, 0x48, 0xd0, 0xf7, 0xbb, 0xe4, 0x3a, 0xc4, 0xf6, 0x9d, 0x3e, 0x4a, 0xe5,
+	0xb9, 0xab, 0x43, 0x91, 0xe4, 0x65, 0x88, 0x0d, 0xc6, 0x4c, 0x3e, 0xd9, 0xf2, 0xe9, 0x50, 0x06,
+	0xc1, 0x42, 0x16, 0x05, 0x0e, 0xc6, 0x5d, 0x7f, 0xec, 0xc5, 0x2a, 0x5c, 0xb8, 0x3b, 0x19, 0xbb,
+	0xce, 0xe0, 0x9e, 0xe5, 0x5a, 0xa3, 0x41, 0xcf, 0xee, 0x8d, 0xdd, 0xde, 0xfe, 0x56, 0x6b, 0x34,
+	0x3e, 0x68, 0xf5, 0xad, 0x11, 0x0b, 0x71, 0x56, 0xbf, 0xbd, 0x8a, 0x83, 0x8f, 0x9b, 0xfc, 0xed,
+	0x6a, 0x1e, 0x62, 0xf5, 0x46, 0x83, 0x66, 0x13, 0xf5, 0x46, 0x63, 0x55, 0x53, 0x6a, 0xab, 0x90,
+	0xee, 0x8e, 0x2c, 0x8b, 0x3a, 0x98, 0x67, 0x9d, 0x66, 0xbe, 0x8c, 0xd1, 0xd3, 0x87, 0xd5, 0xde,
+	0x86, 0xd4, 0x3e, 0x3b, 0xcf, 0x90, 0x67, 0x9e, 0xdd, 0x0b, 0x7f, 0xcc, 0xee, 0x90, 0x2e, 0x88,
+	0x80, 0xe8, 0x29, 0xc8, 0xf4, 0x78, 0x6a, 0xbb, 0x90, 0x19, 0x35, 0x9f, 0x4f, 0xfa, 0x21, 0x8b,
+	0x58, 0x72, 0xd2, 0xf4, 0x88, 0x17, 0xd5, 0x36, 0x60, 0xc1, 0x76, 0xbc, 0xbf, 0xb2, 0x9a, 0x6d,
+	0xbe, 0x5f, 0x67, 0xa5, 0x8a, 0x5e, 0x03, 0x16, 0xfb, 0x43, 0xdc, 0x76, 0x78, 0x05, 0xdb, 0xe3,
+	0xb5, 0x75, 0xd0, 0x04, 0xa2, 0x0e, 0x73, 0x0a, 0x32, 0x9e, 0x0e, 0xfb, 0x0f, 0xde, 0xe7, 0x41,
+	0x3f, 0x12, 0xa1, 0xe1, 0x3b, 0x5d, 0x46, 0xd3, 0x65, 0x9f, 0x34, 0xf8, 0x34, 0xe8, 0x3c, 0xa7,
+	0x69, 0xa8, 0xdf, 0x93, 0xd1, 0x1c, 0xb0, 0xef, 0x1d, 0x44, 0x9a, 0xaa, 0x11, 0x99, 0x9d, 0xc9,
+	0x31, 0xba, 0xd3, 0x63, 0x1f, 0x2c, 0xf8, 0x3c, 0xcc, 0xad, 0xce, 0x20, 0x7a, 0x5e, 0x87, 0xbe,
+	0xcc, 0xbe, 0x66, 0x08, 0x11, 0x4d, 0xf5, 0x68, 0x7c, 0x8c, 0x1e, 0x3d, 0x61, 0x1f, 0x0f, 0xf8,
+	0x44, 0x3b, 0xb3, 0x7a, 0x34, 0x3e, 0x46, 0x8f, 0xfa, 0xec, 0xc3, 0x82, 0x10, 0x51, 0xd5, 0xa8,
+	0x6d, 0x02, 0x11, 0x17, 0x9e, 0xc7, 0x20, 0x29, 0xd3, 0x80, 0x7d, 0x30, 0x12, 0x2c, 0x3d, 0x33,
+	0x9a, 0x45, 0xf5, 0xbc, 0x4e, 0xd9, 0xec, 0x6b, 0x92, 0x30, 0x55, 0xd5, 0xa8, 0x3d, 0x80, 0xd3,
+	0xe2, 0xf0, 0x8e, 0xd5, 0x2d, 0x87, 0x7d, 0x0a, 0x11, 0x0c, 0x90, 0x5b, 0xcd, 0x24, 0x7b, 0x5e,
+	0xc7, 0x86, 0xec, 0x33, 0x89, 0x08, 0x59, 0xd5, 0xa8, 0xdd, 0x85, 0xbc, 0x40, 0xb6, 0x87, 0xa7,
+	0x67, 0x19, 0xd1, 0xfb, 0xec, 0xe3, 0x1e, 0x9f, 0x88, 0xe6, 0x0d, 0xd1, 0xd5, 0x63, 0x91, 0x54,
+	0x4a, 0x33, 0x62, 0xdf, 0xa6, 0x04, 0xfd, 0x41, 0x9b, 0xc8, 0x46, 0xd9, 0x63, 0x61, 0x57, 0xc6,
+	0x33, 0x66, 0xdf, 0xad, 0x04, 0xdd, 0xa1, 0x26, 0xb5, 0x41, 0x68, 0x50, 0x16, 0x0d, 0xa6, 0x52,
+	0x16, 0x17, 0xfd, 0x7e, 0x49, 0x02, 0x59, 0x16, 0x2f, 0x69, 0x84, 0xe1, 0xd3, 0xd7, 0xda, 0x03,
+	0x98, 0x3f, 0x89, 0xcb, 0xfa, 0x50, 0x61, 0x27, 0xf6, 0xca, 0x32, 0x3d, 0xd4, 0x9b, 0x73, 0xed,
+	0x90, 0xe7, 0xda, 0x80, 0xb9, 0x13, 0xb8, 0xad, 0x8f, 0x14, 0x76, 0xee, 0xa5, 0x5c, 0x66, 0xae,
+	0x1d, 0xf6, 0x5d, 0x73, 0x27, 0x70, 0x5c, 0x1f, 0x2b, 0xec, 0xa2, 0xc4, 0x28, 0xfb, 0x34, 0x9e,
+	0xef, 0x9a, 0x3b, 0x81, 0xe3, 0xfa, 0x84, 0x9d, 0x6b, 0x55, 0xa3, 0x22, 0xd2, 0xa0, 0xa7, 0x98,
+	0x3f, 0x89, 0xe3, 0xfa, 0x54, 0xc1, 0x8b, 0x13, 0xd5, 0x30, 0xfc, 0xf9, 0xf1, 0x7d, 0xd7, 0xfc,
+	0x49, 0x1c, 0xd7, 0x57, 0x31, 0x9a, 0xd6, 0x54, 0x63, 0x2d, 0x44, 0x14, 0xee, 0xd1, 0x71, 0x1c,
+	0xd7, 0xd7, 0x14, 0xbc, 0xf5, 0x50, 0x8d, 0xaa, 0x4f, 0xb4, 0x33, 0xd5, 0xa3, 0xe3, 0x38, 0xae,
+	0xaf, 0xe3, 0x29, 0xa2, 0xa6, 0x1a, 0x37, 0x42, 0x44, 0xe8, 0xbb, 0xf2, 0x27, 0x72, 0x5c, 0xdf,
+	0x50, 0xf0, 0x82, 0x4a, 0x35, 0x6e, 0x9a, 0x5e, 0x0f, 0x02, 0xdf, 0x95, 0x3f, 0x91, 0xe3, 0xfa,
+	0xa6, 0x82, 0x37, 0x59, 0xaa, 0x71, 0x2b, 0x4c, 0x85, 0xbe, 0x4b, 0x3b, 0x99, 0xe3, 0xfa, 0x4c,
+	0xc1, 0xef, 0x56, 0xd4, 0xb5, 0x15, 0xd3, 0xeb, 0x84, 0xe0, 0xbb, 0xb4, 0x93, 0x39, 0xae, 0x6f,
+	0x29, 0xf8, 0x31, 0x8b, 0xba, 0xb6, 0x1a, 0x21, 0xab, 0x1a, 0xb5, 0x75, 0xc8, 0x1d, 0xdf, 0x71,
+	0x7d, 0x5b, 0xbc, 0x27, 0xcc, 0xb6, 0x05, 0xef, 0xf5, 0x58, 0x58, 0xbf, 0x63, 0xb8, 0xae, 0xef,
+	0xe0, 0x69, 0xab, 0xf6, 0xc2, 0x7d, 0x76, 0x9b, 0xc6, 0x4c, 0x5e, 0x6d, 0x5b, 0x9d, 0x37, 0x3a,
+	0x8e, 0x13, 0x2c, 0x29, 0x73, 0x68, 0x8d, 0x60, 0xf7, 0x1c, 0xc3, 0x9b, 0x7d, 0x57, 0xc1, 0xcb,
+	0xb7, 0x1c, 0xa7, 0x46, 0x0b, 0x7f, 0x1f, 0x31, 0xd7, 0x66, 0x07, 0x63, 0x7e, 0xbe, 0x5f, 0xfb,
+	0x9e, 0x72, 0x32, 0xc7, 0x56, 0x8b, 0x35, 0xb6, 0xd7, 0xfd, 0xc9, 0xc1, 0x92, 0xb7, 0x20, 0x7e,
+	0x58, 0x5e, 0x59, 0x0d, 0xa7, 0x78, 0xe2, 0xdd, 0x33, 0x73, 0x67, 0xd9, 0xf2, 0x42, 0xe8, 0x92,
+	0x7e, 0x30, 0x74, 0x8f, 0x4c, 0xb4, 0xe4, 0x0c, 0x65, 0x09, 0xc3, 0x47, 0x52, 0x86, 0x32, 0x67,
+	0xa8, 0x48, 0x18, 0x3e, 0x96, 0x32, 0x54, 0x38, 0x83, 0x21, 0x61, 0xf8, 0x44, 0xca, 0x60, 0x70,
+	0x86, 0x35, 0x09, 0xc3, 0xa7, 0x52, 0x86, 0x35, 0xce, 0x50, 0x95, 0x30, 0x7c, 0x55, 0xca, 0x50,
+	0xe5, 0x0c, 0x37, 0x24, 0x0c, 0x5f, 0x93, 0x32, 0xdc, 0xe0, 0x0c, 0x37, 0x25, 0x0c, 0x5f, 0x97,
+	0x32, 0xdc, 0xe4, 0x0c, 0xb7, 0x24, 0x0c, 0xdf, 0x90, 0x32, 0xdc, 0x62, 0x0c, 0xab, 0x2b, 0x12,
+	0x86, 0x6f, 0xca, 0x18, 0x56, 0x57, 0x38, 0x83, 0x4c, 0x93, 0x9f, 0x49, 0x19, 0xb8, 0x26, 0x57,
+	0x65, 0x9a, 0xfc, 0x96, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0x6f, 0x4b, 0x19, 0xb8, 0x26,
+	0x57, 0x65, 0x9a, 0xfc, 0x8e, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0xef, 0x4a, 0x19, 0xb8,
+	0x26, 0x57, 0x65, 0x9a, 0xfc, 0x9e, 0x94, 0x81, 0x6b, 0x72, 0x55, 0xa6, 0xc9, 0x3f, 0x91, 0x32,
+	0x70, 0x4d, 0xae, 0xca, 0x34, 0xf9, 0xa7, 0x52, 0x06, 0xae, 0xc9, 0x55, 0x99, 0x26, 0xff, 0x4c,
+	0xca, 0xc0, 0x35, 0x59, 0x96, 0x69, 0xf2, 0xfb, 0x32, 0x86, 0x32, 0xd7, 0x64, 0x59, 0xa6, 0xc9,
+	0x3f, 0x97, 0x32, 0x70, 0x4d, 0x96, 0x65, 0x9a, 0xfc, 0x0b, 0x29, 0x03, 0xd7, 0x64, 0x59, 0xa6,
+	0xc9, 0x1f, 0x48, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xa5, 0x94, 0x81, 0x6b, 0xb2, 0x2c,
+	0xd3, 0xe4, 0x5f, 0x49, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xb5, 0x94, 0x81, 0x6b, 0xb2,
+	0x2c, 0xd3, 0xe4, 0xdf, 0x48, 0x19, 0xb8, 0x26, 0xcb, 0x32, 0x4d, 0xfe, 0xad, 0x94, 0x81, 0x6b,
+	0xb2, 0x2c, 0xd3, 0xe4, 0xdf, 0x49, 0x19, 0xb8, 0x26, 0x2b, 0x32, 0x4d, 0xfe, 0xbd, 0x8c, 0xa1,
+	0xc2, 0x35, 0x59, 0x91, 0x69, 0xf2, 0x1f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26, 0xff, 0x51,
+	0xca, 0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0x9f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26, 0xff,
+	0x59, 0xca, 0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0x5f, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99, 0x26,
+	0xff, 0x55, 0xca, 0xc0, 0x35, 0x59, 0x91, 0x69, 0xf2, 0xdf, 0xa4, 0x0c, 0x5c, 0x93, 0x15, 0x99,
+	0x26, 0x7f, 0x28, 0x65, 0xe0, 0x9a, 0xac, 0xc8, 0x34, 0xf9, 0xef, 0x52, 0x06, 0xae, 0x49, 0x43,
+	0xa6, 0xc9, 0xff, 0x90, 0x31, 0x18, 0x5c, 0x93, 0x86, 0x4c, 0x93, 0xff, 0x29, 0x65, 0xe0, 0x9a,
+	0x34, 0x64, 0x9a, 0xfc, 0x2f, 0x29, 0x03, 0xd7, 0xa4, 0x21, 0xd3, 0xe4, 0x7f, 0x4b, 0x19, 0xb8,
+	0x26, 0x0d, 0x99, 0x26, 0xff, 0x47, 0xca, 0xc0, 0x35, 0x69, 0xc8, 0x34, 0xf9, 0xbf, 0x52, 0x06,
+	0xae, 0x49, 0x43, 0xa6, 0xc9, 0x1f, 0x49, 0x19, 0xb8, 0x26, 0x0d, 0x99, 0x26, 0x7f, 0x2c, 0x65,
+	0xe0, 0x9a, 0x34, 0x64, 0x9a, 0xfc, 0x89, 0x94, 0x81, 0x6b, 0xd2, 0x90, 0x69, 0xf2, 0xa7, 0x52,
+	0x06, 0xae, 0xc9, 0x35, 0x99, 0x26, 0xff, 0x4f, 0xc6, 0xb0, 0xb6, 0x72, 0xe7, 0xda, 0xe3, 0x57,
+	0xba, 0x3d, 0xf7, 0x60, 0xb2, 0xb7, 0xbc, 0xef, 0x0c, 0xae, 0x77, 0x9d, 0xae, 0x73, 0x1d, 0x41,
+	0x7b, 0x93, 0x0e, 0x7b, 0xb8, 0x1e, 0x18, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x54, 0xfe,
+	0xf9, 0x01, 0xbd, 0x3d, 0x00, 0x00,
 }
diff --git a/proto/test_proto/test.proto b/proto/test_proto/test.proto
index 6bc874c..36f6fa0 100644
--- a/proto/test_proto/test.proto
+++ b/proto/test_proto/test.proto
@@ -560,3 +560,7 @@
     Strings msg = 10;
   }
 }
+
+message CustomDeterministicMarshaler {
+  optional uint64 field1 = 1;
+}
\ No newline at end of file
diff --git a/protoc-gen-gogo/generator/generator.go b/protoc-gen-gogo/generator/generator.go
index c74fc8d..d9bd660 100644
--- a/protoc-gen-gogo/generator/generator.go
+++ b/protoc-gen-gogo/generator/generator.go
@@ -2344,14 +2344,33 @@
 	g.In()
 	if gogoproto.IsMarshaler(g.file.FileDescriptorProto, message.DescriptorProto) ||
 		gogoproto.IsUnsafeMarshaler(g.file.FileDescriptorProto, message.DescriptorProto) {
-		g.P("b = b[:cap(b)]")
-		g.P("n, err := m.MarshalTo(b)")
-		g.P("if err != nil {")
-		g.In()
-		g.P("return nil, err")
-		g.Out()
-		g.P("}")
-		g.P("return b[:n], nil")
+		if gogoproto.IsStableMarshaler(g.file.FileDescriptorProto, message.DescriptorProto) {
+			g.P("b = b[:cap(b)]")
+			g.P("n, err := m.MarshalTo(b)")
+			g.P("if err != nil {")
+			g.In()
+			g.P("return nil, err")
+			g.Out()
+			g.P("}")
+			g.P("return b[:n], nil")
+		} else {
+			g.P("if deterministic {")
+			g.In()
+			g.P("return xxx_messageInfo_", ccTypeName, ".Marshal(b, m, deterministic)")
+			g.P("} else {")
+			g.In()
+			g.P("b = b[:cap(b)]")
+			g.P("n, err := m.MarshalTo(b)")
+			g.P("if err != nil {")
+			g.In()
+			g.P("return nil, err")
+			g.Out()
+			g.P("}")
+			g.Out()
+			g.P("return b[:n], nil")
+			g.Out()
+			g.P("}")
+		}
 	} else {
 		g.P("return xxx_messageInfo_", ccTypeName, ".Marshal(b, m, deterministic)")
 	}
diff --git a/test/combos/both/thetest.pb.go b/test/combos/both/thetest.pb.go
index 69b4c8c..d5e4bad 100644
--- a/test/combos/both/thetest.pb.go
+++ b/test/combos/both/thetest.pb.go
@@ -254,12 +254,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptNative.Merge(dst, src)
@@ -303,12 +307,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNative.Merge(dst, src)
@@ -352,12 +360,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepNative.Merge(dst, src)
@@ -401,12 +413,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepNative.Merge(dst, src)
@@ -448,12 +464,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepPackedNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepPackedNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepPackedNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepPackedNative.Merge(dst, src)
@@ -495,12 +515,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepPackedNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepPackedNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepPackedNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepPackedNative.Merge(dst, src)
@@ -539,12 +563,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidOptStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptStruct.Merge(dst, src)
@@ -583,12 +611,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptStruct.Merge(dst, src)
@@ -627,12 +659,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepStruct.Merge(dst, src)
@@ -671,12 +707,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepStruct.Merge(dst, src)
@@ -708,12 +748,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidEmbeddedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidEmbeddedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidEmbeddedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidEmbeddedStruct.Merge(dst, src)
@@ -745,12 +789,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinEmbeddedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinEmbeddedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinEmbeddedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinEmbeddedStruct.Merge(dst, src)
@@ -781,12 +829,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidNestedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidNestedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidNestedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidNestedStruct.Merge(dst, src)
@@ -817,12 +869,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinNestedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinNestedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinNestedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinNestedStruct.Merge(dst, src)
@@ -853,12 +909,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidOptCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptCustom.Merge(dst, src)
@@ -888,12 +948,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomDash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomDash.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomDash) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomDash.Merge(dst, src)
@@ -924,12 +988,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptCustom.Merge(dst, src)
@@ -960,12 +1028,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepCustom.Merge(dst, src)
@@ -996,12 +1068,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepCustom.Merge(dst, src)
@@ -1039,12 +1115,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptNativeUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNativeUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNativeUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNativeUnion.Merge(dst, src)
@@ -1082,12 +1162,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptStructUnion.Merge(dst, src)
@@ -1119,12 +1203,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinEmbeddedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinEmbeddedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinEmbeddedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinEmbeddedStructUnion.Merge(dst, src)
@@ -1156,12 +1244,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinNestedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinNestedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinNestedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinNestedStructUnion.Merge(dst, src)
@@ -1193,12 +1285,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Tree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Tree.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Tree) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Tree.Merge(dst, src)
@@ -1229,12 +1325,16 @@
 	return m.Unmarshal(b)
 }
 func (m *OrBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_OrBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *OrBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_OrBranch.Merge(dst, src)
@@ -1265,12 +1365,16 @@
 	return m.Unmarshal(b)
 }
 func (m *AndBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AndBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AndBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AndBranch.Merge(dst, src)
@@ -1301,12 +1405,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Leaf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Leaf.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Leaf) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Leaf.Merge(dst, src)
@@ -1338,12 +1446,16 @@
 	return m.Unmarshal(b)
 }
 func (m *DeepTree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_DeepTree.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *DeepTree) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_DeepTree.Merge(dst, src)
@@ -1373,12 +1485,16 @@
 	return m.Unmarshal(b)
 }
 func (m *ADeepBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_ADeepBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *ADeepBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_ADeepBranch.Merge(dst, src)
@@ -1409,12 +1525,16 @@
 	return m.Unmarshal(b)
 }
 func (m *AndDeepBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AndDeepBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AndDeepBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AndDeepBranch.Merge(dst, src)
@@ -1444,12 +1564,16 @@
 	return m.Unmarshal(b)
 }
 func (m *DeepLeaf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_DeepLeaf.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *DeepLeaf) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_DeepLeaf.Merge(dst, src)
@@ -1478,12 +1602,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Nil) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Nil.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Nil) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Nil.Merge(dst, src)
@@ -1513,12 +1641,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptEnum.Merge(dst, src)
@@ -1550,12 +1682,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptEnum.Merge(dst, src)
@@ -1587,12 +1723,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepEnum.Merge(dst, src)
@@ -1624,12 +1764,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepEnum.Merge(dst, src)
@@ -1661,12 +1805,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptEnumDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptEnumDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptEnumDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptEnumDefault.Merge(dst, src)
@@ -1723,12 +1871,16 @@
 	return m.Unmarshal(b)
 }
 func (m *AnotherNinOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AnotherNinOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AnotherNinOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AnotherNinOptEnum.Merge(dst, src)
@@ -1760,12 +1912,16 @@
 	return m.Unmarshal(b)
 }
 func (m *AnotherNinOptEnumDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AnotherNinOptEnumDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AnotherNinOptEnumDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AnotherNinOptEnumDefault.Merge(dst, src)
@@ -1822,12 +1978,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Timer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Timer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Timer) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Timer.Merge(dst, src)
@@ -1866,12 +2026,16 @@
 	return m.Unmarshal(b)
 }
 func (m *MyExtendable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_MyExtendable.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *MyExtendable) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_MyExtendable.Merge(dst, src)
@@ -1913,12 +2077,16 @@
 	return m.Unmarshal(b)
 }
 func (m *OtherExtenable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_OtherExtenable.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *OtherExtenable) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_OtherExtenable.Merge(dst, src)
@@ -1951,12 +2119,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NestedDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition.Merge(dst, src)
@@ -1987,12 +2159,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NestedDefinition_NestedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition_NestedMessage.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition_NestedMessage) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition_NestedMessage.Merge(dst, src)
@@ -2024,12 +2200,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NestedDefinition_NestedMessage_NestedNestedMsg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition_NestedMessage_NestedNestedMsg) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Merge(dst, src)
@@ -2061,12 +2241,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NestedScope) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedScope.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedScope) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedScope.Merge(dst, src)
@@ -2110,12 +2294,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptNativeDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNativeDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNativeDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNativeDefault.Merge(dst, src)
@@ -2265,12 +2453,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomContainer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomContainer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomContainer) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomContainer.Merge(dst, src)
@@ -2314,12 +2506,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameNidOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNidOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNidOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNidOptNative.Merge(dst, src)
@@ -2363,12 +2559,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameNinOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinOptNative.Merge(dst, src)
@@ -2412,12 +2612,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameNinRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinRepNative.Merge(dst, src)
@@ -2456,12 +2660,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameNinStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinStruct.Merge(dst, src)
@@ -2494,12 +2702,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameCustomType.Merge(dst, src)
@@ -2531,12 +2743,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameNinEmbeddedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinEmbeddedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Merge(dst, src)
@@ -2567,12 +2783,16 @@
 	return m.Unmarshal(b)
 }
 func (m *CustomNameEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameEnum.Merge(dst, src)
@@ -2617,12 +2837,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NoExtensionsMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NoExtensionsMap.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NoExtensionsMap) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NoExtensionsMap.Merge(dst, src)
@@ -2651,12 +2875,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Unrecognized) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Unrecognized.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Unrecognized) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Unrecognized.Merge(dst, src)
@@ -2687,12 +2915,16 @@
 	return m.Unmarshal(b)
 }
 func (m *UnrecognizedWithInner) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithInner.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithInner) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithInner.Merge(dst, src)
@@ -2721,12 +2953,16 @@
 	return m.Unmarshal(b)
 }
 func (m *UnrecognizedWithInner_Inner) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithInner_Inner.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithInner_Inner) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithInner_Inner.Merge(dst, src)
@@ -2757,12 +2993,16 @@
 	return m.Unmarshal(b)
 }
 func (m *UnrecognizedWithEmbed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithEmbed.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithEmbed) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithEmbed.Merge(dst, src)
@@ -2791,12 +3031,16 @@
 	return m.Unmarshal(b)
 }
 func (m *UnrecognizedWithEmbed_Embedded) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithEmbed_Embedded) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Merge(dst, src)
@@ -2827,12 +3071,16 @@
 	return m.Unmarshal(b)
 }
 func (m *Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Node.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Node) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Node.Merge(dst, src)
@@ -2862,12 +3110,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NonByteCustomType.Merge(dst, src)
@@ -2897,12 +3149,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidOptNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptNonByteCustomType.Merge(dst, src)
@@ -2932,12 +3188,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinOptNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNonByteCustomType.Merge(dst, src)
@@ -2967,12 +3227,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NidRepNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepNonByteCustomType.Merge(dst, src)
@@ -3002,12 +3266,16 @@
 	return m.Unmarshal(b)
 }
 func (m *NinRepNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepNonByteCustomType.Merge(dst, src)
@@ -3037,12 +3305,16 @@
 	return m.Unmarshal(b)
 }
 func (m *ProtoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_ProtoType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *ProtoType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_ProtoType.Merge(dst, src)
diff --git a/test/combos/marshaler/thetest.pb.go b/test/combos/marshaler/thetest.pb.go
index 2da2eaa..64cc7e8 100644
--- a/test/combos/marshaler/thetest.pb.go
+++ b/test/combos/marshaler/thetest.pb.go
@@ -252,12 +252,16 @@
 	return xxx_messageInfo_NidOptNative.Unmarshal(m, b)
 }
 func (m *NidOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptNative.Merge(dst, src)
@@ -301,12 +305,16 @@
 	return xxx_messageInfo_NinOptNative.Unmarshal(m, b)
 }
 func (m *NinOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNative.Merge(dst, src)
@@ -350,12 +358,16 @@
 	return xxx_messageInfo_NidRepNative.Unmarshal(m, b)
 }
 func (m *NidRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepNative.Merge(dst, src)
@@ -399,12 +411,16 @@
 	return xxx_messageInfo_NinRepNative.Unmarshal(m, b)
 }
 func (m *NinRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepNative.Merge(dst, src)
@@ -446,12 +462,16 @@
 	return xxx_messageInfo_NidRepPackedNative.Unmarshal(m, b)
 }
 func (m *NidRepPackedNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepPackedNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepPackedNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepPackedNative.Merge(dst, src)
@@ -493,12 +513,16 @@
 	return xxx_messageInfo_NinRepPackedNative.Unmarshal(m, b)
 }
 func (m *NinRepPackedNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepPackedNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepPackedNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepPackedNative.Merge(dst, src)
@@ -537,12 +561,16 @@
 	return xxx_messageInfo_NidOptStruct.Unmarshal(m, b)
 }
 func (m *NidOptStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptStruct.Merge(dst, src)
@@ -581,12 +609,16 @@
 	return xxx_messageInfo_NinOptStruct.Unmarshal(m, b)
 }
 func (m *NinOptStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptStruct.Merge(dst, src)
@@ -625,12 +657,16 @@
 	return xxx_messageInfo_NidRepStruct.Unmarshal(m, b)
 }
 func (m *NidRepStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepStruct.Merge(dst, src)
@@ -669,12 +705,16 @@
 	return xxx_messageInfo_NinRepStruct.Unmarshal(m, b)
 }
 func (m *NinRepStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepStruct.Merge(dst, src)
@@ -706,12 +746,16 @@
 	return xxx_messageInfo_NidEmbeddedStruct.Unmarshal(m, b)
 }
 func (m *NidEmbeddedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidEmbeddedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidEmbeddedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidEmbeddedStruct.Merge(dst, src)
@@ -743,12 +787,16 @@
 	return xxx_messageInfo_NinEmbeddedStruct.Unmarshal(m, b)
 }
 func (m *NinEmbeddedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinEmbeddedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinEmbeddedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinEmbeddedStruct.Merge(dst, src)
@@ -779,12 +827,16 @@
 	return xxx_messageInfo_NidNestedStruct.Unmarshal(m, b)
 }
 func (m *NidNestedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidNestedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidNestedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidNestedStruct.Merge(dst, src)
@@ -815,12 +867,16 @@
 	return xxx_messageInfo_NinNestedStruct.Unmarshal(m, b)
 }
 func (m *NinNestedStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinNestedStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinNestedStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinNestedStruct.Merge(dst, src)
@@ -851,12 +907,16 @@
 	return xxx_messageInfo_NidOptCustom.Unmarshal(m, b)
 }
 func (m *NidOptCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptCustom.Merge(dst, src)
@@ -886,12 +946,16 @@
 	return xxx_messageInfo_CustomDash.Unmarshal(m, b)
 }
 func (m *CustomDash) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomDash.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomDash) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomDash.Merge(dst, src)
@@ -922,12 +986,16 @@
 	return xxx_messageInfo_NinOptCustom.Unmarshal(m, b)
 }
 func (m *NinOptCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptCustom.Merge(dst, src)
@@ -958,12 +1026,16 @@
 	return xxx_messageInfo_NidRepCustom.Unmarshal(m, b)
 }
 func (m *NidRepCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepCustom.Merge(dst, src)
@@ -994,12 +1066,16 @@
 	return xxx_messageInfo_NinRepCustom.Unmarshal(m, b)
 }
 func (m *NinRepCustom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepCustom.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepCustom) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepCustom.Merge(dst, src)
@@ -1037,12 +1113,16 @@
 	return xxx_messageInfo_NinOptNativeUnion.Unmarshal(m, b)
 }
 func (m *NinOptNativeUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNativeUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNativeUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNativeUnion.Merge(dst, src)
@@ -1080,12 +1160,16 @@
 	return xxx_messageInfo_NinOptStructUnion.Unmarshal(m, b)
 }
 func (m *NinOptStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptStructUnion.Merge(dst, src)
@@ -1117,12 +1201,16 @@
 	return xxx_messageInfo_NinEmbeddedStructUnion.Unmarshal(m, b)
 }
 func (m *NinEmbeddedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinEmbeddedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinEmbeddedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinEmbeddedStructUnion.Merge(dst, src)
@@ -1154,12 +1242,16 @@
 	return xxx_messageInfo_NinNestedStructUnion.Unmarshal(m, b)
 }
 func (m *NinNestedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinNestedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinNestedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinNestedStructUnion.Merge(dst, src)
@@ -1191,12 +1283,16 @@
 	return xxx_messageInfo_Tree.Unmarshal(m, b)
 }
 func (m *Tree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Tree.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Tree) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Tree.Merge(dst, src)
@@ -1227,12 +1323,16 @@
 	return xxx_messageInfo_OrBranch.Unmarshal(m, b)
 }
 func (m *OrBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_OrBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *OrBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_OrBranch.Merge(dst, src)
@@ -1263,12 +1363,16 @@
 	return xxx_messageInfo_AndBranch.Unmarshal(m, b)
 }
 func (m *AndBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AndBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AndBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AndBranch.Merge(dst, src)
@@ -1299,12 +1403,16 @@
 	return xxx_messageInfo_Leaf.Unmarshal(m, b)
 }
 func (m *Leaf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Leaf.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Leaf) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Leaf.Merge(dst, src)
@@ -1336,12 +1444,16 @@
 	return xxx_messageInfo_DeepTree.Unmarshal(m, b)
 }
 func (m *DeepTree) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_DeepTree.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *DeepTree) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_DeepTree.Merge(dst, src)
@@ -1371,12 +1483,16 @@
 	return xxx_messageInfo_ADeepBranch.Unmarshal(m, b)
 }
 func (m *ADeepBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_ADeepBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *ADeepBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_ADeepBranch.Merge(dst, src)
@@ -1407,12 +1523,16 @@
 	return xxx_messageInfo_AndDeepBranch.Unmarshal(m, b)
 }
 func (m *AndDeepBranch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AndDeepBranch.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AndDeepBranch) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AndDeepBranch.Merge(dst, src)
@@ -1442,12 +1562,16 @@
 	return xxx_messageInfo_DeepLeaf.Unmarshal(m, b)
 }
 func (m *DeepLeaf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_DeepLeaf.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *DeepLeaf) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_DeepLeaf.Merge(dst, src)
@@ -1476,12 +1600,16 @@
 	return xxx_messageInfo_Nil.Unmarshal(m, b)
 }
 func (m *Nil) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Nil.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Nil) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Nil.Merge(dst, src)
@@ -1511,12 +1639,16 @@
 	return xxx_messageInfo_NidOptEnum.Unmarshal(m, b)
 }
 func (m *NidOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptEnum.Merge(dst, src)
@@ -1548,12 +1680,16 @@
 	return xxx_messageInfo_NinOptEnum.Unmarshal(m, b)
 }
 func (m *NinOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptEnum.Merge(dst, src)
@@ -1585,12 +1721,16 @@
 	return xxx_messageInfo_NidRepEnum.Unmarshal(m, b)
 }
 func (m *NidRepEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepEnum.Merge(dst, src)
@@ -1622,12 +1762,16 @@
 	return xxx_messageInfo_NinRepEnum.Unmarshal(m, b)
 }
 func (m *NinRepEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepEnum.Merge(dst, src)
@@ -1659,12 +1803,16 @@
 	return xxx_messageInfo_NinOptEnumDefault.Unmarshal(m, b)
 }
 func (m *NinOptEnumDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptEnumDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptEnumDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptEnumDefault.Merge(dst, src)
@@ -1721,12 +1869,16 @@
 	return xxx_messageInfo_AnotherNinOptEnum.Unmarshal(m, b)
 }
 func (m *AnotherNinOptEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AnotherNinOptEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AnotherNinOptEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AnotherNinOptEnum.Merge(dst, src)
@@ -1758,12 +1910,16 @@
 	return xxx_messageInfo_AnotherNinOptEnumDefault.Unmarshal(m, b)
 }
 func (m *AnotherNinOptEnumDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_AnotherNinOptEnumDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *AnotherNinOptEnumDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_AnotherNinOptEnumDefault.Merge(dst, src)
@@ -1820,12 +1976,16 @@
 	return xxx_messageInfo_Timer.Unmarshal(m, b)
 }
 func (m *Timer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Timer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Timer) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Timer.Merge(dst, src)
@@ -1864,12 +2024,16 @@
 	return xxx_messageInfo_MyExtendable.Unmarshal(m, b)
 }
 func (m *MyExtendable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_MyExtendable.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *MyExtendable) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_MyExtendable.Merge(dst, src)
@@ -1911,12 +2075,16 @@
 	return xxx_messageInfo_OtherExtenable.Unmarshal(m, b)
 }
 func (m *OtherExtenable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_OtherExtenable.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *OtherExtenable) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_OtherExtenable.Merge(dst, src)
@@ -1949,12 +2117,16 @@
 	return xxx_messageInfo_NestedDefinition.Unmarshal(m, b)
 }
 func (m *NestedDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition.Merge(dst, src)
@@ -1985,12 +2157,16 @@
 	return xxx_messageInfo_NestedDefinition_NestedMessage.Unmarshal(m, b)
 }
 func (m *NestedDefinition_NestedMessage) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition_NestedMessage.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition_NestedMessage) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition_NestedMessage.Merge(dst, src)
@@ -2022,12 +2198,16 @@
 	return xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Unmarshal(m, b)
 }
 func (m *NestedDefinition_NestedMessage_NestedNestedMsg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedDefinition_NestedMessage_NestedNestedMsg) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Merge(dst, src)
@@ -2059,12 +2239,16 @@
 	return xxx_messageInfo_NestedScope.Unmarshal(m, b)
 }
 func (m *NestedScope) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NestedScope.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NestedScope) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NestedScope.Merge(dst, src)
@@ -2108,12 +2292,16 @@
 	return xxx_messageInfo_NinOptNativeDefault.Unmarshal(m, b)
 }
 func (m *NinOptNativeDefault) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNativeDefault.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNativeDefault) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNativeDefault.Merge(dst, src)
@@ -2263,12 +2451,16 @@
 	return xxx_messageInfo_CustomContainer.Unmarshal(m, b)
 }
 func (m *CustomContainer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomContainer.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomContainer) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomContainer.Merge(dst, src)
@@ -2312,12 +2504,16 @@
 	return xxx_messageInfo_CustomNameNidOptNative.Unmarshal(m, b)
 }
 func (m *CustomNameNidOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNidOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNidOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNidOptNative.Merge(dst, src)
@@ -2361,12 +2557,16 @@
 	return xxx_messageInfo_CustomNameNinOptNative.Unmarshal(m, b)
 }
 func (m *CustomNameNinOptNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinOptNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinOptNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinOptNative.Merge(dst, src)
@@ -2410,12 +2610,16 @@
 	return xxx_messageInfo_CustomNameNinRepNative.Unmarshal(m, b)
 }
 func (m *CustomNameNinRepNative) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinRepNative.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinRepNative) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinRepNative.Merge(dst, src)
@@ -2454,12 +2658,16 @@
 	return xxx_messageInfo_CustomNameNinStruct.Unmarshal(m, b)
 }
 func (m *CustomNameNinStruct) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinStruct.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinStruct) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinStruct.Merge(dst, src)
@@ -2492,12 +2700,16 @@
 	return xxx_messageInfo_CustomNameCustomType.Unmarshal(m, b)
 }
 func (m *CustomNameCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameCustomType.Merge(dst, src)
@@ -2529,12 +2741,16 @@
 	return xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Unmarshal(m, b)
 }
 func (m *CustomNameNinEmbeddedStructUnion) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameNinEmbeddedStructUnion) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Merge(dst, src)
@@ -2565,12 +2781,16 @@
 	return xxx_messageInfo_CustomNameEnum.Unmarshal(m, b)
 }
 func (m *CustomNameEnum) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_CustomNameEnum.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *CustomNameEnum) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_CustomNameEnum.Merge(dst, src)
@@ -2615,12 +2835,16 @@
 	return xxx_messageInfo_NoExtensionsMap.Unmarshal(m, b)
 }
 func (m *NoExtensionsMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NoExtensionsMap.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NoExtensionsMap) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NoExtensionsMap.Merge(dst, src)
@@ -2649,12 +2873,16 @@
 	return xxx_messageInfo_Unrecognized.Unmarshal(m, b)
 }
 func (m *Unrecognized) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Unrecognized.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Unrecognized) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Unrecognized.Merge(dst, src)
@@ -2685,12 +2913,16 @@
 	return xxx_messageInfo_UnrecognizedWithInner.Unmarshal(m, b)
 }
 func (m *UnrecognizedWithInner) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithInner.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithInner) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithInner.Merge(dst, src)
@@ -2719,12 +2951,16 @@
 	return xxx_messageInfo_UnrecognizedWithInner_Inner.Unmarshal(m, b)
 }
 func (m *UnrecognizedWithInner_Inner) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithInner_Inner.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithInner_Inner) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithInner_Inner.Merge(dst, src)
@@ -2755,12 +2991,16 @@
 	return xxx_messageInfo_UnrecognizedWithEmbed.Unmarshal(m, b)
 }
 func (m *UnrecognizedWithEmbed) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithEmbed.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithEmbed) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithEmbed.Merge(dst, src)
@@ -2789,12 +3029,16 @@
 	return xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Unmarshal(m, b)
 }
 func (m *UnrecognizedWithEmbed_Embedded) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *UnrecognizedWithEmbed_Embedded) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Merge(dst, src)
@@ -2825,12 +3069,16 @@
 	return xxx_messageInfo_Node.Unmarshal(m, b)
 }
 func (m *Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_Node.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *Node) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_Node.Merge(dst, src)
@@ -2860,12 +3108,16 @@
 	return xxx_messageInfo_NonByteCustomType.Unmarshal(m, b)
 }
 func (m *NonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NonByteCustomType.Merge(dst, src)
@@ -2895,12 +3147,16 @@
 	return xxx_messageInfo_NidOptNonByteCustomType.Unmarshal(m, b)
 }
 func (m *NidOptNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidOptNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidOptNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidOptNonByteCustomType.Merge(dst, src)
@@ -2930,12 +3186,16 @@
 	return xxx_messageInfo_NinOptNonByteCustomType.Unmarshal(m, b)
 }
 func (m *NinOptNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinOptNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinOptNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinOptNonByteCustomType.Merge(dst, src)
@@ -2965,12 +3225,16 @@
 	return xxx_messageInfo_NidRepNonByteCustomType.Unmarshal(m, b)
 }
 func (m *NidRepNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NidRepNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NidRepNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NidRepNonByteCustomType.Merge(dst, src)
@@ -3000,12 +3264,16 @@
 	return xxx_messageInfo_NinRepNonByteCustomType.Unmarshal(m, b)
 }
 func (m *NinRepNonByteCustomType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_NinRepNonByteCustomType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *NinRepNonByteCustomType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_NinRepNonByteCustomType.Merge(dst, src)
@@ -3035,12 +3303,16 @@
 	return xxx_messageInfo_ProtoType.Unmarshal(m, b)
 }
 func (m *ProtoType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalTo(b)
-	if err != nil {
-		return nil, err
+	if deterministic {
+		return xxx_messageInfo_ProtoType.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
 	}
-	return b[:n], nil
 }
 func (dst *ProtoType) XXX_Merge(src proto.Message) {
 	xxx_messageInfo_ProtoType.Merge(dst, src)
diff --git a/test/deterministic/Makefile b/test/deterministic/Makefile
new file mode 100644
index 0000000..dbb2815
--- /dev/null
+++ b/test/deterministic/Makefile
@@ -0,0 +1,32 @@
+# Protocol Buffers for Go with Gadgets
+#
+# Copyright (c) 2018, The GoGo Authors. All rights reserved.
+# http://github.com/gogo/protobuf
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+regenerate:
+	go install github.com/gogo/protobuf/protoc-min-version
+	protoc-min-version --version="3.0.0" --gogo_out=:. \
+	--proto_path=../../../../../:../../protobuf/:. deterministic.proto
\ No newline at end of file
diff --git a/test/deterministic/deterministic.pb.go b/test/deterministic/deterministic.pb.go
new file mode 100644
index 0000000..ad24d7b
--- /dev/null
+++ b/test/deterministic/deterministic.pb.go
@@ -0,0 +1,1310 @@
+// Code generated by protoc-gen-gogo. DO NOT EDIT.
+// source: deterministic.proto
+
+package deterministic
+
+import proto "github.com/gogo/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import _ "github.com/gogo/protobuf/gogoproto"
+
+import bytes "bytes"
+
+import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+
+type OrderedMap struct {
+	StringMap            map[string]string `protobuf:"bytes,1,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *OrderedMap) Reset()         { *m = OrderedMap{} }
+func (m *OrderedMap) String() string { return proto.CompactTextString(m) }
+func (*OrderedMap) ProtoMessage()    {}
+func (*OrderedMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{0}
+}
+func (m *OrderedMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_OrderedMap.Unmarshal(m, b)
+}
+func (m *OrderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalTo(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (dst *OrderedMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_OrderedMap.Merge(dst, src)
+}
+func (m *OrderedMap) XXX_Size() int {
+	return m.Size()
+}
+func (m *OrderedMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_OrderedMap.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_OrderedMap proto.InternalMessageInfo
+
+func (m *OrderedMap) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
+type UnorderedMap struct {
+	StringMap            map[string]string `protobuf:"bytes,1,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *UnorderedMap) Reset()         { *m = UnorderedMap{} }
+func (m *UnorderedMap) String() string { return proto.CompactTextString(m) }
+func (*UnorderedMap) ProtoMessage()    {}
+func (*UnorderedMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{1}
+}
+func (m *UnorderedMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_UnorderedMap.Unmarshal(m, b)
+}
+func (m *UnorderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_UnorderedMap.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *UnorderedMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_UnorderedMap.Merge(dst, src)
+}
+func (m *UnorderedMap) XXX_Size() int {
+	return m.Size()
+}
+func (m *UnorderedMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_UnorderedMap.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_UnorderedMap proto.InternalMessageInfo
+
+func (m *UnorderedMap) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
+type MapNoMarshaler struct {
+	StringMap            map[string]string `protobuf:"bytes,1,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *MapNoMarshaler) Reset()         { *m = MapNoMarshaler{} }
+func (m *MapNoMarshaler) String() string { return proto.CompactTextString(m) }
+func (*MapNoMarshaler) ProtoMessage()    {}
+func (*MapNoMarshaler) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{2}
+}
+func (m *MapNoMarshaler) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_MapNoMarshaler.Unmarshal(m, b)
+}
+func (m *MapNoMarshaler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_MapNoMarshaler.Marshal(b, m, deterministic)
+}
+func (dst *MapNoMarshaler) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MapNoMarshaler.Merge(dst, src)
+}
+func (m *MapNoMarshaler) XXX_Size() int {
+	return xxx_messageInfo_MapNoMarshaler.Size(m)
+}
+func (m *MapNoMarshaler) XXX_DiscardUnknown() {
+	xxx_messageInfo_MapNoMarshaler.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_MapNoMarshaler proto.InternalMessageInfo
+
+func (m *MapNoMarshaler) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
+type NestedOrderedMap struct {
+	StringMap            map[string]string `protobuf:"bytes,1,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	NestedMap            *NestedMap1       `protobuf:"bytes,2,opt,name=NestedMap" json:"NestedMap,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *NestedOrderedMap) Reset()         { *m = NestedOrderedMap{} }
+func (m *NestedOrderedMap) String() string { return proto.CompactTextString(m) }
+func (*NestedOrderedMap) ProtoMessage()    {}
+func (*NestedOrderedMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{3}
+}
+func (m *NestedOrderedMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NestedOrderedMap.Unmarshal(m, b)
+}
+func (m *NestedOrderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalTo(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (dst *NestedOrderedMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NestedOrderedMap.Merge(dst, src)
+}
+func (m *NestedOrderedMap) XXX_Size() int {
+	return m.Size()
+}
+func (m *NestedOrderedMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_NestedOrderedMap.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NestedOrderedMap proto.InternalMessageInfo
+
+func (m *NestedOrderedMap) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
+func (m *NestedOrderedMap) GetNestedMap() *NestedMap1 {
+	if m != nil {
+		return m.NestedMap
+	}
+	return nil
+}
+
+type NestedMap1 struct {
+	NestedStringMap      map[string]string `protobuf:"bytes,1,rep,name=NestedStringMap" json:"NestedStringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *NestedMap1) Reset()         { *m = NestedMap1{} }
+func (m *NestedMap1) String() string { return proto.CompactTextString(m) }
+func (*NestedMap1) ProtoMessage()    {}
+func (*NestedMap1) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{4}
+}
+func (m *NestedMap1) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NestedMap1.Unmarshal(m, b)
+}
+func (m *NestedMap1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalTo(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (dst *NestedMap1) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NestedMap1.Merge(dst, src)
+}
+func (m *NestedMap1) XXX_Size() int {
+	return m.Size()
+}
+func (m *NestedMap1) XXX_DiscardUnknown() {
+	xxx_messageInfo_NestedMap1.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NestedMap1 proto.InternalMessageInfo
+
+func (m *NestedMap1) GetNestedStringMap() map[string]string {
+	if m != nil {
+		return m.NestedStringMap
+	}
+	return nil
+}
+
+type NestedUnorderedMap struct {
+	StringMap            map[string]string `protobuf:"bytes,1,rep,name=StringMap" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	NestedMap            *NestedMap2       `protobuf:"bytes,2,opt,name=NestedMap" json:"NestedMap,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *NestedUnorderedMap) Reset()         { *m = NestedUnorderedMap{} }
+func (m *NestedUnorderedMap) String() string { return proto.CompactTextString(m) }
+func (*NestedUnorderedMap) ProtoMessage()    {}
+func (*NestedUnorderedMap) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{5}
+}
+func (m *NestedUnorderedMap) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NestedUnorderedMap.Unmarshal(m, b)
+}
+func (m *NestedUnorderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_NestedUnorderedMap.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *NestedUnorderedMap) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NestedUnorderedMap.Merge(dst, src)
+}
+func (m *NestedUnorderedMap) XXX_Size() int {
+	return m.Size()
+}
+func (m *NestedUnorderedMap) XXX_DiscardUnknown() {
+	xxx_messageInfo_NestedUnorderedMap.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NestedUnorderedMap proto.InternalMessageInfo
+
+func (m *NestedUnorderedMap) GetStringMap() map[string]string {
+	if m != nil {
+		return m.StringMap
+	}
+	return nil
+}
+
+func (m *NestedUnorderedMap) GetNestedMap() *NestedMap2 {
+	if m != nil {
+		return m.NestedMap
+	}
+	return nil
+}
+
+type NestedMap2 struct {
+	NestedStringMap      map[string]string `protobuf:"bytes,1,rep,name=NestedStringMap" json:"NestedStringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
+	XXX_unrecognized     []byte            `json:"-"`
+	XXX_sizecache        int32             `json:"-"`
+}
+
+func (m *NestedMap2) Reset()         { *m = NestedMap2{} }
+func (m *NestedMap2) String() string { return proto.CompactTextString(m) }
+func (*NestedMap2) ProtoMessage()    {}
+func (*NestedMap2) Descriptor() ([]byte, []int) {
+	return fileDescriptor_deterministic_f6340fb8decdd007, []int{6}
+}
+func (m *NestedMap2) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_NestedMap2.Unmarshal(m, b)
+}
+func (m *NestedMap2) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_NestedMap2.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (dst *NestedMap2) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_NestedMap2.Merge(dst, src)
+}
+func (m *NestedMap2) XXX_Size() int {
+	return m.Size()
+}
+func (m *NestedMap2) XXX_DiscardUnknown() {
+	xxx_messageInfo_NestedMap2.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_NestedMap2 proto.InternalMessageInfo
+
+func (m *NestedMap2) GetNestedStringMap() map[string]string {
+	if m != nil {
+		return m.NestedStringMap
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*OrderedMap)(nil), "deterministic.OrderedMap")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.OrderedMap.StringMapEntry")
+	proto.RegisterType((*UnorderedMap)(nil), "deterministic.UnorderedMap")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.UnorderedMap.StringMapEntry")
+	proto.RegisterType((*MapNoMarshaler)(nil), "deterministic.MapNoMarshaler")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.MapNoMarshaler.StringMapEntry")
+	proto.RegisterType((*NestedOrderedMap)(nil), "deterministic.NestedOrderedMap")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.NestedOrderedMap.StringMapEntry")
+	proto.RegisterType((*NestedMap1)(nil), "deterministic.NestedMap1")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.NestedMap1.NestedStringMapEntry")
+	proto.RegisterType((*NestedUnorderedMap)(nil), "deterministic.NestedUnorderedMap")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.NestedUnorderedMap.StringMapEntry")
+	proto.RegisterType((*NestedMap2)(nil), "deterministic.NestedMap2")
+	proto.RegisterMapType((map[string]string)(nil), "deterministic.NestedMap2.NestedStringMapEntry")
+}
+func (this *OrderedMap) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*OrderedMap)
+	if !ok {
+		that2, ok := that.(OrderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *OrderedMap")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *OrderedMap but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *OrderedMap but is not nil && this == nil")
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return fmt.Errorf("StringMap this(%v) Not Equal that(%v)", len(this.StringMap), len(that1.StringMap))
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return fmt.Errorf("StringMap this[%v](%v) Not Equal that[%v](%v)", i, this.StringMap[i], i, that1.StringMap[i])
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *OrderedMap) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*OrderedMap)
+	if !ok {
+		that2, ok := that.(OrderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return false
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return false
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *UnorderedMap) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*UnorderedMap)
+	if !ok {
+		that2, ok := that.(UnorderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *UnorderedMap")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *UnorderedMap but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *UnorderedMap but is not nil && this == nil")
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return fmt.Errorf("StringMap this(%v) Not Equal that(%v)", len(this.StringMap), len(that1.StringMap))
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return fmt.Errorf("StringMap this[%v](%v) Not Equal that[%v](%v)", i, this.StringMap[i], i, that1.StringMap[i])
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *UnorderedMap) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*UnorderedMap)
+	if !ok {
+		that2, ok := that.(UnorderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return false
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return false
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *MapNoMarshaler) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*MapNoMarshaler)
+	if !ok {
+		that2, ok := that.(MapNoMarshaler)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *MapNoMarshaler")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *MapNoMarshaler but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *MapNoMarshaler but is not nil && this == nil")
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return fmt.Errorf("StringMap this(%v) Not Equal that(%v)", len(this.StringMap), len(that1.StringMap))
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return fmt.Errorf("StringMap this[%v](%v) Not Equal that[%v](%v)", i, this.StringMap[i], i, that1.StringMap[i])
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *MapNoMarshaler) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*MapNoMarshaler)
+	if !ok {
+		that2, ok := that.(MapNoMarshaler)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return false
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return false
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *NestedOrderedMap) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*NestedOrderedMap)
+	if !ok {
+		that2, ok := that.(NestedOrderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *NestedOrderedMap")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *NestedOrderedMap but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *NestedOrderedMap but is not nil && this == nil")
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return fmt.Errorf("StringMap this(%v) Not Equal that(%v)", len(this.StringMap), len(that1.StringMap))
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return fmt.Errorf("StringMap this[%v](%v) Not Equal that[%v](%v)", i, this.StringMap[i], i, that1.StringMap[i])
+		}
+	}
+	if !this.NestedMap.Equal(that1.NestedMap) {
+		return fmt.Errorf("NestedMap this(%v) Not Equal that(%v)", this.NestedMap, that1.NestedMap)
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *NestedOrderedMap) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*NestedOrderedMap)
+	if !ok {
+		that2, ok := that.(NestedOrderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return false
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return false
+		}
+	}
+	if !this.NestedMap.Equal(that1.NestedMap) {
+		return false
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *NestedMap1) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*NestedMap1)
+	if !ok {
+		that2, ok := that.(NestedMap1)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *NestedMap1")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *NestedMap1 but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *NestedMap1 but is not nil && this == nil")
+	}
+	if len(this.NestedStringMap) != len(that1.NestedStringMap) {
+		return fmt.Errorf("NestedStringMap this(%v) Not Equal that(%v)", len(this.NestedStringMap), len(that1.NestedStringMap))
+	}
+	for i := range this.NestedStringMap {
+		if this.NestedStringMap[i] != that1.NestedStringMap[i] {
+			return fmt.Errorf("NestedStringMap this[%v](%v) Not Equal that[%v](%v)", i, this.NestedStringMap[i], i, that1.NestedStringMap[i])
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *NestedMap1) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*NestedMap1)
+	if !ok {
+		that2, ok := that.(NestedMap1)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.NestedStringMap) != len(that1.NestedStringMap) {
+		return false
+	}
+	for i := range this.NestedStringMap {
+		if this.NestedStringMap[i] != that1.NestedStringMap[i] {
+			return false
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *NestedUnorderedMap) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*NestedUnorderedMap)
+	if !ok {
+		that2, ok := that.(NestedUnorderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *NestedUnorderedMap")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *NestedUnorderedMap but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *NestedUnorderedMap but is not nil && this == nil")
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return fmt.Errorf("StringMap this(%v) Not Equal that(%v)", len(this.StringMap), len(that1.StringMap))
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return fmt.Errorf("StringMap this[%v](%v) Not Equal that[%v](%v)", i, this.StringMap[i], i, that1.StringMap[i])
+		}
+	}
+	if !this.NestedMap.Equal(that1.NestedMap) {
+		return fmt.Errorf("NestedMap this(%v) Not Equal that(%v)", this.NestedMap, that1.NestedMap)
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *NestedUnorderedMap) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*NestedUnorderedMap)
+	if !ok {
+		that2, ok := that.(NestedUnorderedMap)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.StringMap) != len(that1.StringMap) {
+		return false
+	}
+	for i := range this.StringMap {
+		if this.StringMap[i] != that1.StringMap[i] {
+			return false
+		}
+	}
+	if !this.NestedMap.Equal(that1.NestedMap) {
+		return false
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (this *NestedMap2) VerboseEqual(that interface{}) error {
+	if that == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that == nil && this != nil")
+	}
+
+	that1, ok := that.(*NestedMap2)
+	if !ok {
+		that2, ok := that.(NestedMap2)
+		if ok {
+			that1 = &that2
+		} else {
+			return fmt.Errorf("that is not of type *NestedMap2")
+		}
+	}
+	if that1 == nil {
+		if this == nil {
+			return nil
+		}
+		return fmt.Errorf("that is type *NestedMap2 but is nil && this != nil")
+	} else if this == nil {
+		return fmt.Errorf("that is type *NestedMap2 but is not nil && this == nil")
+	}
+	if len(this.NestedStringMap) != len(that1.NestedStringMap) {
+		return fmt.Errorf("NestedStringMap this(%v) Not Equal that(%v)", len(this.NestedStringMap), len(that1.NestedStringMap))
+	}
+	for i := range this.NestedStringMap {
+		if this.NestedStringMap[i] != that1.NestedStringMap[i] {
+			return fmt.Errorf("NestedStringMap this[%v](%v) Not Equal that[%v](%v)", i, this.NestedStringMap[i], i, that1.NestedStringMap[i])
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized)
+	}
+	return nil
+}
+func (this *NestedMap2) Equal(that interface{}) bool {
+	if that == nil {
+		return this == nil
+	}
+
+	that1, ok := that.(*NestedMap2)
+	if !ok {
+		that2, ok := that.(NestedMap2)
+		if ok {
+			that1 = &that2
+		} else {
+			return false
+		}
+	}
+	if that1 == nil {
+		return this == nil
+	} else if this == nil {
+		return false
+	}
+	if len(this.NestedStringMap) != len(that1.NestedStringMap) {
+		return false
+	}
+	for i := range this.NestedStringMap {
+		if this.NestedStringMap[i] != that1.NestedStringMap[i] {
+			return false
+		}
+	}
+	if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) {
+		return false
+	}
+	return true
+}
+func (m *OrderedMap) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *OrderedMap) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		keysForStringMap := make([]string, 0, len(m.StringMap))
+		for k := range m.StringMap {
+			keysForStringMap = append(keysForStringMap, string(k))
+		}
+		github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap)
+		for _, k := range keysForStringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.StringMap[string(k)]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func (m *UnorderedMap) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *UnorderedMap) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k := range m.StringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.StringMap[k]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func (m *NestedOrderedMap) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *NestedOrderedMap) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		keysForStringMap := make([]string, 0, len(m.StringMap))
+		for k := range m.StringMap {
+			keysForStringMap = append(keysForStringMap, string(k))
+		}
+		github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap)
+		for _, k := range keysForStringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.StringMap[string(k)]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.NestedMap != nil {
+		dAtA[i] = 0x12
+		i++
+		i = encodeVarintDeterministic(dAtA, i, uint64(m.NestedMap.Size()))
+		n1, err := m.NestedMap.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n1
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func (m *NestedMap1) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *NestedMap1) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.NestedStringMap) > 0 {
+		keysForNestedStringMap := make([]string, 0, len(m.NestedStringMap))
+		for k := range m.NestedStringMap {
+			keysForNestedStringMap = append(keysForNestedStringMap, string(k))
+		}
+		github_com_gogo_protobuf_sortkeys.Strings(keysForNestedStringMap)
+		for _, k := range keysForNestedStringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.NestedStringMap[string(k)]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func (m *NestedUnorderedMap) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *NestedUnorderedMap) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k := range m.StringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.StringMap[k]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.NestedMap != nil {
+		dAtA[i] = 0x12
+		i++
+		i = encodeVarintDeterministic(dAtA, i, uint64(m.NestedMap.Size()))
+		n2, err := m.NestedMap.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n2
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func (m *NestedMap2) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *NestedMap2) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.NestedStringMap) > 0 {
+		for k := range m.NestedStringMap {
+			dAtA[i] = 0xa
+			i++
+			v := m.NestedStringMap[k]
+			mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			i = encodeVarintDeterministic(dAtA, i, uint64(mapSize))
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(k)))
+			i += copy(dAtA[i:], k)
+			dAtA[i] = 0x12
+			i++
+			i = encodeVarintDeterministic(dAtA, i, uint64(len(v)))
+			i += copy(dAtA[i:], v)
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
+func encodeVarintDeterministic(dAtA []byte, offset int, v uint64) int {
+	for v >= 1<<7 {
+		dAtA[offset] = uint8(v&0x7f | 0x80)
+		v >>= 7
+		offset++
+	}
+	dAtA[offset] = uint8(v)
+	return offset + 1
+}
+func (m *OrderedMap) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k, v := range m.StringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *UnorderedMap) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k, v := range m.StringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *MapNoMarshaler) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k, v := range m.StringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *NestedOrderedMap) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k, v := range m.StringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.NestedMap != nil {
+		l = m.NestedMap.Size()
+		n += 1 + l + sovDeterministic(uint64(l))
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *NestedMap1) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.NestedStringMap) > 0 {
+		for k, v := range m.NestedStringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *NestedUnorderedMap) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.StringMap) > 0 {
+		for k, v := range m.StringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.NestedMap != nil {
+		l = m.NestedMap.Size()
+		n += 1 + l + sovDeterministic(uint64(l))
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func (m *NestedMap2) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.NestedStringMap) > 0 {
+		for k, v := range m.NestedStringMap {
+			_ = k
+			_ = v
+			mapEntrySize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v)))
+			n += mapEntrySize + 1 + sovDeterministic(uint64(mapEntrySize))
+		}
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
+func sovDeterministic(x uint64) (n int) {
+	for {
+		n++
+		x >>= 7
+		if x == 0 {
+			break
+		}
+	}
+	return n
+}
+func sozDeterministic(x uint64) (n int) {
+	return sovDeterministic(uint64((x << 1) ^ uint64((int64(x) >> 63))))
+}
+
+func init() { proto.RegisterFile("deterministic.proto", fileDescriptor_deterministic_f6340fb8decdd007) }
+
+var fileDescriptor_deterministic_f6340fb8decdd007 = []byte{
+	// 385 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0x49, 0x2d, 0x49,
+	0x2d, 0xca, 0xcd, 0xcc, 0xcb, 0x2c, 0x2e, 0xc9, 0x4c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17,
+	0xe2, 0x45, 0x11, 0x94, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5,
+	0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0xab, 0x4a, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b,
+	0xa2, 0x5b, 0x69, 0x0e, 0x23, 0x17, 0x97, 0x7f, 0x51, 0x4a, 0x6a, 0x51, 0x6a, 0x8a, 0x6f, 0x62,
+	0x81, 0x90, 0x1b, 0x17, 0x67, 0x70, 0x49, 0x51, 0x66, 0x5e, 0xba, 0x6f, 0x62, 0x81, 0x04, 0xa3,
+	0x02, 0xb3, 0x06, 0xb7, 0x91, 0x86, 0x1e, 0xaa, 0xad, 0x08, 0xd5, 0x7a, 0x70, 0xa5, 0xae, 0x79,
+	0x25, 0x45, 0x95, 0x41, 0x08, 0xad, 0x52, 0x36, 0x5c, 0x7c, 0xa8, 0x92, 0x42, 0x02, 0x5c, 0xcc,
+	0xd9, 0xa9, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6, 0x90, 0x08, 0x17, 0x6b,
+	0x59, 0x62, 0x4e, 0x69, 0xaa, 0x04, 0x13, 0x58, 0x0c, 0xc2, 0xb1, 0x62, 0xb2, 0x60, 0xb4, 0xe2,
+	0xe8, 0x58, 0x28, 0xcf, 0x38, 0x63, 0xa1, 0x3c, 0xa3, 0xd2, 0x02, 0x46, 0x2e, 0x9e, 0xd0, 0xbc,
+	0x7c, 0x84, 0x03, 0x3d, 0x30, 0x1d, 0xa8, 0x85, 0xe6, 0x40, 0x64, 0xf5, 0x34, 0x77, 0x22, 0x03,
+	0xc8, 0x89, 0x7c, 0xbe, 0x89, 0x05, 0x7e, 0xf9, 0xbe, 0x89, 0x45, 0xc5, 0x19, 0x89, 0x39, 0xa9,
+	0x45, 0x42, 0x5e, 0x98, 0x8e, 0xd4, 0x41, 0x73, 0x24, 0xaa, 0x0e, 0x9a, 0x39, 0x93, 0xa5, 0x03,
+	0xe4, 0xc4, 0x87, 0x8c, 0x5c, 0x02, 0x7e, 0xa9, 0xc5, 0x25, 0xa9, 0x29, 0x48, 0x51, 0xed, 0x83,
+	0xe9, 0x48, 0x3d, 0x34, 0x47, 0xa2, 0xeb, 0xc1, 0xed, 0x4c, 0x21, 0x73, 0x2e, 0x4e, 0x88, 0x6a,
+	0x90, 0x69, 0x20, 0x67, 0x70, 0x1b, 0x49, 0x62, 0x35, 0xcd, 0x37, 0xb1, 0xc0, 0x30, 0x08, 0xa1,
+	0x96, 0x6a, 0x29, 0x65, 0x0b, 0x23, 0x17, 0x17, 0xc2, 0x06, 0xa1, 0x08, 0x2e, 0x7e, 0x08, 0x8f,
+	0x38, 0x3f, 0x82, 0xf4, 0xe8, 0xa1, 0x69, 0x80, 0xf8, 0x11, 0xdd, 0x18, 0x29, 0x27, 0x2e, 0x11,
+	0x6c, 0x0a, 0xc9, 0x74, 0xf6, 0x53, 0x46, 0x2e, 0x21, 0x88, 0x71, 0x28, 0xc9, 0xdc, 0x0f, 0x33,
+	0x72, 0x0c, 0xb0, 0x3a, 0x9c, 0xb8, 0xc4, 0x4e, 0x52, 0xf4, 0x18, 0x51, 0x3f, 0x7a, 0x18, 0x50,
+	0xa3, 0xc7, 0x88, 0x8c, 0xe8, 0x31, 0x1a, 0x80, 0xe8, 0x61, 0x70, 0x12, 0x78, 0xf0, 0x50, 0x8e,
+	0x71, 0xc5, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x3f, 0x3c, 0x92, 0x63, 0x4c, 0x62, 0x03,
+	0x97, 0x9b, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xcf, 0x58, 0xa8, 0x8c, 0x05, 0x00,
+	0x00,
+}
diff --git a/test/deterministic/deterministic.proto b/test/deterministic/deterministic.proto
new file mode 100644
index 0000000..0be9c2f
--- /dev/null
+++ b/test/deterministic/deterministic.proto
@@ -0,0 +1,81 @@
+// Protocol Buffers for Go with Gadgets
+//
+// Copyright (c) 2018, The GoGo Authors. All rights reserved.
+// http://github.com/gogo/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto3";
+package deterministic;
+
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+
+option (gogoproto.verbose_equal_all) = true;
+option (gogoproto.equal_all) = true;
+option (gogoproto.sizer_all) = true;
+
+option (gogoproto.enum_stringer_all) = true;
+
+message OrderedMap {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = true;
+	map<string, string> StringMap = 1;
+}
+
+message UnorderedMap {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = false;
+	map<string, string> StringMap = 1;
+}
+
+message MapNoMarshaler {
+    option (gogoproto.marshaler) = false;
+	map<string, string> StringMap = 1;
+}
+
+message NestedOrderedMap {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = true;
+	map<string, string> StringMap = 1;
+    NestedMap1 NestedMap = 2;
+}
+
+message NestedMap1 {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = true;
+	map<string, string> NestedStringMap = 1;
+}
+
+message NestedUnorderedMap {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = false;
+    map<string, string> StringMap = 1;
+    NestedMap2 NestedMap = 2;
+}
+
+message NestedMap2 {
+    option (gogoproto.marshaler) = true;
+    option (gogoproto.stable_marshaler) = false;
+	map<string, string> NestedStringMap = 1;
+}
\ No newline at end of file
diff --git a/test/deterministic/deterministic_test.go b/test/deterministic/deterministic_test.go
new file mode 100644
index 0000000..e6edc53
--- /dev/null
+++ b/test/deterministic/deterministic_test.go
@@ -0,0 +1,207 @@
+// Protocol Buffers for Go with Gadgets
+//
+// Copyright (c) 2018, The GoGo Authors. All rights reserved.
+// http://github.com/gogo/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package deterministic
+
+import (
+	"bytes"
+	"github.com/gogo/protobuf/proto"
+	"testing"
+)
+
+func getTestMap() map[string]string {
+	return map[string]string{
+		"a": "1",
+		"b": "2",
+		"c": "3",
+		"d": "4",
+		"e": "5",
+		"f": "6",
+		"g": "7",
+		"h": "8",
+		"i": "9",
+		"j": "10",
+		"k": "11",
+		"l": "12",
+		"m": "13",
+		"n": "14",
+	}
+
+}
+
+func TestOrderedMap(t *testing.T) {
+	var b proto.Buffer
+	m := getTestMap()
+	in := &OrderedMap{
+		StringMap: m,
+	}
+	if err := b.Marshal(in); err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	data1 := b.Bytes()
+	out := &OrderedMap{}
+	if err := proto.Unmarshal(data1, out); err != nil {
+		t.Fatal(err)
+	}
+	if err := in.VerboseEqual(out); err != nil {
+		t.Fatal(err)
+	}
+	data2, err := proto.Marshal(in)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bytes.Compare(data1, data2) != 0 {
+		t.Fatal("byte arrays are not the same\n", data1, "\n", data2)
+	}
+}
+
+func TestUnorderedMap(t *testing.T) {
+	m := getTestMap()
+	in := &UnorderedMap{
+		StringMap: m,
+	}
+	var b proto.Buffer
+	b.SetDeterministic(true)
+	if err := b.Marshal(in); err == nil {
+		t.Fatalf("Expected Marshal to return error rejecting deterministic flag")
+	}
+}
+
+func TestMapNoMarshaler(t *testing.T) {
+	m := getTestMap()
+	in := &MapNoMarshaler{
+		StringMap: m,
+	}
+
+	var b1 proto.Buffer
+	b1.SetDeterministic(true)
+	if err := b1.Marshal(in); err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	data1 := b1.Bytes()
+
+	out := &MapNoMarshaler{}
+	err := proto.Unmarshal(data1, out)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := in.VerboseEqual(out); err != nil {
+		t.Fatal(err)
+	}
+
+	var b2 proto.Buffer
+	b2.SetDeterministic(true)
+	if err := b2.Marshal(in); err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	data2 := b2.Bytes()
+
+	if bytes.Compare(data1, data2) != 0 {
+		t.Fatal("byte arrays are not the same:\n", data1, "\n", data2)
+	}
+}
+
+func TestOrderedNestedMap(t *testing.T) {
+	var b proto.Buffer
+	in := &NestedOrderedMap{
+		StringMap: getTestMap(),
+		NestedMap: &NestedMap1{
+			NestedStringMap: getTestMap(),
+		},
+	}
+	if err := b.Marshal(in); err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	data1 := b.Bytes()
+	out := &NestedOrderedMap{}
+	if err := proto.Unmarshal(data1, out); err != nil {
+		t.Fatal(err)
+	}
+	if err := in.VerboseEqual(out); err != nil {
+		t.Fatal(err)
+	}
+	data2, err := proto.Marshal(in)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bytes.Compare(data1, data2) != 0 {
+		t.Fatal("byte arrays are not the same\n", data1, "\n", data2)
+	}
+}
+
+func TestUnorderedNestedMap(t *testing.T) {
+	in := &NestedUnorderedMap{
+		StringMap: getTestMap(),
+		NestedMap: &NestedMap2{
+			NestedStringMap: getTestMap(),
+		},
+	}
+	var b proto.Buffer
+	b.SetDeterministic(true)
+	if err := b.Marshal(in); err == nil {
+		t.Fatalf("Expected Marshal to return error rejecting deterministic flag")
+	}
+}
+
+func TestOrderedNestedStructMap(t *testing.T) {
+	var b proto.Buffer
+	m := getTestMap()
+	in := &NestedMap1{
+		NestedStringMap: m,
+	}
+	if err := b.Marshal(in); err != nil {
+		t.Fatalf("Marshal failed: %v", err)
+	}
+	data1 := b.Bytes()
+	out := &NestedMap1{}
+	if err := proto.Unmarshal(data1, out); err != nil {
+		t.Fatal(err)
+	}
+	if err := in.VerboseEqual(out); err != nil {
+		t.Fatal(err)
+	}
+	data2, err := proto.Marshal(in)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if bytes.Compare(data1, data2) != 0 {
+		t.Fatal("byte arrays are not the same\n", data1, "\n", data2)
+	}
+}
+
+func TestUnorderedNestedStructMap(t *testing.T) {
+	m := getTestMap()
+	in := &NestedMap2{
+		NestedStringMap: m,
+	}
+	var b proto.Buffer
+	b.SetDeterministic(true)
+	if err := b.Marshal(in); err == nil {
+		t.Fatalf("Expected Marshal to return error rejecting deterministic flag")
+	}
+}