diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index 97c1e23..8cc8888 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -12,7 +12,7 @@ trigger:
 
 variables:
   branch: $[ coalesce(variables['system.PullRequest.TargetBranch'], variables['build.SourceBranchName']) ]
-  GO_VERSION: 1.16.7
+  GO_VERSION: 1.20
   PATH: $(Agent.BuildDirectory)/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 
 pool:
diff --git a/ci/tools/tools.go b/ci/tools/tools.go
index da24839..0673e92 100644
--- a/ci/tools/tools.go
+++ b/ci/tools/tools.go
@@ -1,3 +1,4 @@
+//go:build tools
 // +build tools
 
 // Copyright the Hyperledger Fabric contributors. All rights reserved.
diff --git a/configtx/application_test.go b/configtx/application_test.go
index 5a437ba..8b697db 100644
--- a/configtx/application_test.go
+++ b/configtx/application_test.go
@@ -518,7 +518,7 @@ func TestAppOrgRemoveAnchorPeerFailure(t *testing.T) {
 			orgName:            "Org1",
 			anchorPeerToRemove: Address{Host: "host1", Port: 123},
 			configValues:       map[string]*cb.ConfigValue{AnchorPeersKey: {Value: []byte("a little fire")}},
-			expectedErr:        "failed unmarshaling anchor peer endpoints for application org Org1: proto: can't skip unknown wire type 6",
+			expectedErr:        "failed unmarshaling anchor peer endpoints for application org Org1: proto",
 		},
 	}
 
@@ -547,7 +547,7 @@ func TestAppOrgRemoveAnchorPeerFailure(t *testing.T) {
 			c := New(config)
 
 			err = c.Application().Organization(tt.orgName).RemoveAnchorPeer(tt.anchorPeerToRemove)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -1083,7 +1083,8 @@ func TestApplicationACLsFailure(t *testing.T) {
 	c := New(config)
 
 	applicationACLs, err := c.Application().ACLs()
-	gt.Expect(err).To(MatchError("unmarshaling ACLs: unexpected EOF"))
+	gt.Expect(err.Error()).To(ContainSubstring("unmarshaling ACLs: proto:"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 	gt.Expect(applicationACLs).To(BeNil())
 }
 
@@ -1354,7 +1355,7 @@ func TestAppOrgAddApplicationCapabilityFailures(t *testing.T) {
 					},
 				}
 			},
-			expectedErr: "retrieving application capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving application capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -1381,7 +1382,7 @@ func TestAppOrgAddApplicationCapabilityFailures(t *testing.T) {
 			c := New(config)
 
 			err = c.Application().AddCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -1518,7 +1519,7 @@ func TestAppOrgRemoveApplicationCapabilityFailures(t *testing.T) {
 					},
 				}
 			},
-			expectedErr: "retrieving application capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving application capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -1545,7 +1546,7 @@ func TestAppOrgRemoveApplicationCapabilityFailures(t *testing.T) {
 			c := New(config)
 
 			err = c.Application().RemoveCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
diff --git a/configtx/channel_test.go b/configtx/channel_test.go
index 49653af..692d266 100644
--- a/configtx/channel_test.go
+++ b/configtx/channel_test.go
@@ -110,7 +110,7 @@ func TestSetChannelCapabilityFailures(t *testing.T) {
 					},
 				},
 			},
-			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -124,7 +124,7 @@ func TestSetChannelCapabilityFailures(t *testing.T) {
 			c := New(tt.config)
 
 			err := c.Channel().AddCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -211,7 +211,7 @@ func TestRemoveChannelCapabilityFailures(t *testing.T) {
 					},
 				},
 			},
-			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -225,7 +225,7 @@ func TestRemoveChannelCapabilityFailures(t *testing.T) {
 			c := New(tt.config)
 
 			err := c.Channel().RemoveCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -490,7 +490,7 @@ func TestConfigurationFailures(t *testing.T) {
 					},
 				},
 			},
-			expectedErr: "unmarshaling Consortium: proto: can't skip unknown wire type 6",
+			expectedErr: "unmarshaling Consortium: proto:",
 		},
 		{
 			testName: "when retrieving existing orderer group",
@@ -575,7 +575,7 @@ func TestConfigurationFailures(t *testing.T) {
 					},
 				},
 			},
-			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving channel capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -589,7 +589,7 @@ func TestConfigurationFailures(t *testing.T) {
 			c := New(tt.config)
 
 			_, err := c.Channel().Configuration()
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
diff --git a/configtx/config_test.go b/configtx/config_test.go
index 42903d6..6f633fa 100644
--- a/configtx/config_test.go
+++ b/configtx/config_test.go
@@ -1914,7 +1914,7 @@ func TestNewEnvelopeFailures(t *testing.T) {
 		{
 			spec:            "when the marshaled config update isn't a config update",
 			marshaledUpdate: []byte("not-a-config-update"),
-			expectedErr:     "unmarshaling config update: proto: can't skip unknown wire type 6",
+			expectedErr:     "unmarshaling config update: proto",
 		},
 	}
 
@@ -1925,7 +1925,7 @@ func TestNewEnvelopeFailures(t *testing.T) {
 			gt := NewGomegaWithT(t)
 
 			env, err := NewEnvelope(tc.marshaledUpdate)
-			gt.Expect(err).To(MatchError(tc.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tc.expectedErr))
 			gt.Expect(env).To(BeNil())
 		})
 	}
diff --git a/configtx/internal/policydsl/policyparser.go b/configtx/internal/policydsl/policyparser.go
index d342432..4d54526 100644
--- a/configtx/internal/policydsl/policyparser.go
+++ b/configtx/internal/policydsl/policyparser.go
@@ -264,17 +264,17 @@ func newContext() *context {
 // GATE(P[, P])
 //
 // where:
-//	- GATE is either "and" or "or"
-//	- P is either a principal or another nested call to GATE
+//   - GATE is either "and" or "or"
+//   - P is either a principal or another nested call to GATE
 //
 // A principal is defined as:
 //
-// ORG.ROLE
+// # ORG.ROLE
 //
 // where:
-//	- ORG is a string (representing the MSP identifier)
-//	- ROLE takes the value of any of the RoleXXX constants representing
-//    the required role
+//   - ORG is a string (representing the MSP identifier)
+//   - ROLE takes the value of any of the RoleXXX constants representing
+//     the required role
 func FromString(policy string) (*cb.SignaturePolicyEnvelope, error) {
 	// first we translate the and/or business into outof gates
 	intermediate, err := govaluate.NewEvaluableExpressionWithFunctions(
diff --git a/configtx/msp_test.go b/configtx/msp_test.go
index ac918ab..329128f 100644
--- a/configtx/msp_test.go
+++ b/configtx/msp_test.go
@@ -48,7 +48,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 				badCert := &x509.Certificate{}
 				msp.RootCerts = append(msp.RootCerts, badCert)
 			},
-			expectedErr: "parsing root certs: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing root certs: x509: malformed certificate",
 		},
 		{
 			name:    "Bad intermediate cert",
@@ -57,7 +57,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.IntermediateCerts = append(msp.IntermediateCerts, badCert)
 			},
-			expectedErr: "parsing intermediate certs: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing intermediate certs: x509: malformed certificate",
 		},
 		{
 			name:    "Bad admin cert",
@@ -66,7 +66,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.Admins = append(msp.Admins, badCert)
 			},
-			expectedErr: "parsing admin certs: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing admin certs: x509: malformed certificate",
 		},
 		{
 			name:    "Bad OU Identifier cert",
@@ -75,7 +75,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.OrganizationalUnitIdentifiers[0].Certificate = badCert
 			},
-			expectedErr: "parsing ou identifiers: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing ou identifiers: x509: malformed certificate",
 		},
 		{
 			name:    "Bad tls root cert",
@@ -84,7 +84,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.TLSRootCerts = append(msp.TLSRootCerts, badCert)
 			},
-			expectedErr: "parsing tls root certs: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing tls root certs: x509: malformed certificate",
 		},
 		{
 			name:    "Bad tls intermediate cert",
@@ -93,7 +93,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.TLSIntermediateCerts = append(msp.TLSIntermediateCerts, badCert)
 			},
-			expectedErr: "parsing tls intermediate certs: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing tls intermediate certs: x509: malformed certificate",
 		},
 		{
 			name:    "Bad Client OU Identifier cert",
@@ -102,7 +102,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.NodeOUs.ClientOUIdentifier.Certificate = badCert
 			},
-			expectedErr: "parsing client ou identifier cert: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing client ou identifier cert: x509: malformed certificate",
 		},
 		{
 			name:    "Bad Peer OU Identifier cert",
@@ -111,7 +111,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.NodeOUs.PeerOUIdentifier.Certificate = badCert
 			},
-			expectedErr: "parsing peer ou identifier cert: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing peer ou identifier cert: x509: malformed certificate",
 		},
 		{
 			name:    "Bad Admin OU Identifier cert",
@@ -120,7 +120,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.NodeOUs.AdminOUIdentifier.Certificate = badCert
 			},
-			expectedErr: "parsing admin ou identifier cert: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing admin ou identifier cert: x509: malformed certificate",
 		},
 		{
 			name:    "Bad Orderer OU Identifier cert",
@@ -129,7 +129,7 @@ func TestMSPConfigurationFailures(t *testing.T) {
 			mspMod: func(msp *MSP) {
 				msp.NodeOUs.OrdererOUIdentifier.Certificate = badCert
 			},
-			expectedErr: "parsing orderer ou identifier cert: asn1: syntax error: sequence truncated",
+			expectedErr: "parsing orderer ou identifier cert: x509: malformed certificate",
 		},
 	}
 
diff --git a/configtx/orderer_test.go b/configtx/orderer_test.go
index 9538d35..1a40a5b 100644
--- a/configtx/orderer_test.go
+++ b/configtx/orderer_test.go
@@ -1751,7 +1751,8 @@ func TestRemoveOrdererEndpointFailure(t *testing.T) {
 	c := New(config)
 
 	err := c.Orderer().Organization("OrdererOrg").RemoveEndpoint(Address{Host: "127.0.0.1", Port: 8050})
-	gt.Expect(err).To(MatchError("failed unmarshaling endpoints for orderer org OrdererOrg: proto: can't skip unknown wire type 6"))
+	gt.Expect(err.Error()).To(ContainSubstring("failed unmarshaling endpoints for orderer org OrdererOrg: proto:"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 }
 
 func TestGetOrdererOrg(t *testing.T) {
@@ -2868,7 +2869,7 @@ func TestAddOrdererCapabilityFailures(t *testing.T) {
 					},
 				}
 			},
-			expectedErr: "retrieving orderer capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving orderer capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -2895,7 +2896,7 @@ func TestAddOrdererCapabilityFailures(t *testing.T) {
 			c := New(config)
 
 			err = c.Orderer().AddCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -3172,7 +3173,7 @@ func TestRemoveOrdererCapabilityFailures(t *testing.T) {
 					},
 				}
 			},
-			expectedErr: "retrieving orderer capabilities: unmarshaling capabilities: proto: can't skip unknown wire type 6",
+			expectedErr: "retrieving orderer capabilities: unmarshaling capabilities: proto",
 		},
 	}
 
@@ -3199,7 +3200,7 @@ func TestRemoveOrdererCapabilityFailures(t *testing.T) {
 			c := New(config)
 
 			err = c.Orderer().RemoveCapability(tt.capability)
-			gt.Expect(err).To(MatchError(tt.expectedErr))
+			gt.Expect(err.Error()).To(ContainSubstring(tt.expectedErr))
 		})
 	}
 }
@@ -4661,8 +4662,9 @@ func TestSetMaxMessageCountFailures(t *testing.T) {
 	}
 
 	c := New(config)
+
 	err = c.Orderer().BatchSize().SetMaxMessageCount(5)
-	gt.Expect(err).To(MatchError("unexpected EOF"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 }
 
 func TestSetAbsoluteMaxBytesFailures(t *testing.T) {
@@ -4685,7 +4687,7 @@ func TestSetAbsoluteMaxBytesFailures(t *testing.T) {
 
 	c := New(config)
 	err = c.Orderer().BatchSize().SetAbsoluteMaxBytes(5)
-	gt.Expect(err).To(MatchError("unexpected EOF"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 }
 
 func TestSetPreferredMaxBytesFailures(t *testing.T) {
@@ -4708,7 +4710,7 @@ func TestSetPreferredMaxBytesFailures(t *testing.T) {
 
 	c := New(config)
 	err = c.Orderer().BatchSize().SetPreferredMaxBytes(5)
-	gt.Expect(err).To(MatchError("unexpected EOF"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 }
 
 func TestSetBatchTimeout(t *testing.T) {
diff --git a/configtx/signer_test.go b/configtx/signer_test.go
index d6bf210..ab65112 100644
--- a/configtx/signer_test.go
+++ b/configtx/signer_test.go
@@ -305,6 +305,7 @@ func TestToLowS(t *testing.T) {
 			},
 		},
 	} {
+		test := test
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 
diff --git a/go.mod b/go.mod
index 4aec4db..499c7e0 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,21 @@
 module github.com/hyperledger/fabric-config
 
-go 1.14
+go 1.20
 
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible
-	github.com/golang/protobuf v1.3.3
-	github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e
+	github.com/golang/protobuf v1.5.2
+	github.com/hyperledger/fabric-protos-go v0.3.0
 	github.com/onsi/gomega v1.9.0
 )
+
+require (
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
+	golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
+	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/grpc v1.46.2 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v2 v2.2.4 // indirect
+)
diff --git a/go.sum b/go.sum
index 05e09ac..e1a180e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,54 +1,149 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e h1:9PS5iezHk/j7XriSlNuSQILyCOfcZ9wZ3/PiucmSE8E=
-github.com/hyperledger/fabric-protos-go v0.0.0-20200424173316-dd554ba3746e/go.mod h1:xVYTjK4DtZRBxZ2D9aE4y6AbLaPwue2o/criQyQbVD0=
+github.com/hyperledger/fabric-protos-go v0.3.0 h1:MXxy44WTMENOh5TI8+PCK2x6pMj47Go2vFRKDHB2PZs=
+github.com/hyperledger/fabric-protos-go v0.3.0/go.mod h1:WWnyWP40P2roPmmvxsUXSvVI/CF6vwY1K1UFidnKBys=
 github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/protolator/protoext/commonext/common_test.go b/protolator/protoext/commonext/common_test.go
index 119a8be..31e0d1d 100644
--- a/protolator/protoext/commonext/common_test.go
+++ b/protolator/protoext/commonext/common_test.go
@@ -47,7 +47,8 @@ func TestCommonProtolator(t *testing.T) {
 	}
 	msg, err = payload.VariablyOpaqueFieldProto("data")
 	gt.Expect(msg).To(BeNil())
-	gt.Expect(err).To(MatchError("corrupt channel header: unexpected EOF"))
+	gt.Expect(err.Error()).To(ContainSubstring("corrupt channel header: proto:"))
+	gt.Expect(err.Error()).To(ContainSubstring("cannot parse invalid wire-format data"))
 
 	ch := &common.ChannelHeader{
 		Type: int32(common.HeaderType_CONFIG),