diff --git a/proto/test/v1/proto2/test_all_types.proto b/proto/test/v1/proto2/test_all_types.proto
index adbb5acc..426be2f9 100644
--- a/proto/test/v1/proto2/test_all_types.proto
+++ b/proto/test/v1/proto2/test_all_types.proto
@@ -65,6 +65,8 @@ message TestAllTypes {
     NestedMessage single_nested_message = 21;
     NestedEnum single_nested_enum = 22 [default = BAR];
   }
+  optional NestedMessage standalone_message = 23;
+  optional NestedEnum standalone_enum = 24;
 
   // Repeated
   repeated int32 repeated_int32 = 31;
@@ -101,6 +103,11 @@ message NestedTestAllTypes {
   optional TestAllTypes payload = 2;
 }
 
+// This proto has a required field.
+message TestRequired {
+  required int32 required_int32 = 1;
+}
+
 // This proto tests that global enums are resolved correctly.
 enum GlobalEnum {
   GOO = 0;
diff --git a/proto/test/v1/proto2/test_all_types/test_all_types.pb.go b/proto/test/v1/proto2/test_all_types/test_all_types.pb.go
index e8712685..e171a92b 100755
--- a/proto/test/v1/proto2/test_all_types/test_all_types.pb.go
+++ b/proto/test/v1/proto2/test_all_types/test_all_types.pb.go
@@ -145,6 +145,8 @@ type TestAllTypes struct {
 	//	*TestAllTypes_SingleNestedMessage
 	//	*TestAllTypes_SingleNestedEnum
 	NestedType            isTestAllTypes_NestedType     `protobuf_oneof:"nested_type"`
+	StandaloneMessage     *TestAllTypes_NestedMessage   `protobuf:"bytes,23,opt,name=standalone_message,json=standaloneMessage" json:"standalone_message,omitempty"`
+	StandaloneEnum        *TestAllTypes_NestedEnum      `protobuf:"varint,24,opt,name=standalone_enum,json=standaloneEnum,enum=google.api.expr.test.v1.proto2.TestAllTypes_NestedEnum" json:"standalone_enum,omitempty"`
 	RepeatedInt32         []int32                       `protobuf:"varint,31,rep,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
 	RepeatedInt64         []int64                       `protobuf:"varint,32,rep,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
 	RepeatedUint32        []uint32                      `protobuf:"varint,33,rep,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
@@ -450,6 +452,20 @@ func (m *TestAllTypes) GetSingleNestedEnum() TestAllTypes_NestedEnum {
 	return Default_TestAllTypes_SingleNestedEnum
 }
 
+func (m *TestAllTypes) GetStandaloneMessage() *TestAllTypes_NestedMessage {
+	if m != nil {
+		return m.StandaloneMessage
+	}
+	return nil
+}
+
+func (m *TestAllTypes) GetStandaloneEnum() TestAllTypes_NestedEnum {
+	if m != nil && m.StandaloneEnum != nil {
+		return *m.StandaloneEnum
+	}
+	return TestAllTypes_FOO
+}
+
 func (m *TestAllTypes) GetRepeatedInt32() []int32 {
 	if m != nil {
 		return m.RepeatedInt32
@@ -698,6 +714,45 @@ func (m *NestedTestAllTypes) GetPayload() *TestAllTypes {
 	return nil
 }
 
+type TestRequired struct {
+	RequiredInt32        *int32   `protobuf:"varint,1,req,name=required_int32,json=requiredInt32" json:"required_int32,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TestRequired) Reset()         { *m = TestRequired{} }
+func (m *TestRequired) String() string { return proto.CompactTextString(m) }
+func (*TestRequired) ProtoMessage()    {}
+func (*TestRequired) Descriptor() ([]byte, []int) {
+	return fileDescriptor_98cc99a98b5d98fe, []int{2}
+}
+
+func (m *TestRequired) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TestRequired.Unmarshal(m, b)
+}
+func (m *TestRequired) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TestRequired.Marshal(b, m, deterministic)
+}
+func (m *TestRequired) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TestRequired.Merge(m, src)
+}
+func (m *TestRequired) XXX_Size() int {
+	return xxx_messageInfo_TestRequired.Size(m)
+}
+func (m *TestRequired) XXX_DiscardUnknown() {
+	xxx_messageInfo_TestRequired.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TestRequired proto.InternalMessageInfo
+
+func (m *TestRequired) GetRequiredInt32() int32 {
+	if m != nil && m.RequiredInt32 != nil {
+		return *m.RequiredInt32
+	}
+	return 0
+}
+
 func init() {
 	proto.RegisterEnum("google.api.expr.test.v1.proto2.GlobalEnum", GlobalEnum_name, GlobalEnum_value)
 	proto.RegisterEnum("google.api.expr.test.v1.proto2.TestAllTypes_NestedEnum", TestAllTypes_NestedEnum_name, TestAllTypes_NestedEnum_value)
@@ -706,6 +761,7 @@ func init() {
 	proto.RegisterMapType((map[string]string)(nil), "google.api.expr.test.v1.proto2.TestAllTypes.MapStringStringEntry")
 	proto.RegisterType((*TestAllTypes_NestedMessage)(nil), "google.api.expr.test.v1.proto2.TestAllTypes.NestedMessage")
 	proto.RegisterType((*NestedTestAllTypes)(nil), "google.api.expr.test.v1.proto2.NestedTestAllTypes")
+	proto.RegisterType((*TestRequired)(nil), "google.api.expr.test.v1.proto2.TestRequired")
 }
 
 func init() {
@@ -713,89 +769,93 @@ func init() {
 }
 
 var fileDescriptor_98cc99a98b5d98fe = []byte{
-	// 1338 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x6b, 0x73, 0xd3, 0x46,
-	0x17, 0x66, 0xbd, 0x09, 0x49, 0x36, 0x71, 0xe2, 0x6c, 0x12, 0x58, 0xfc, 0x32, 0xb0, 0x6f, 0xb8,
-	0x64, 0xb9, 0xc4, 0x19, 0x6c, 0xbd, 0x82, 0xd7, 0xd3, 0x76, 0x26, 0x2e, 0x24, 0xb4, 0x53, 0x0a,
-	0xa3, 0x40, 0x3b, 0xc3, 0x17, 0x8f, 0x6c, 0x6f, 0x8c, 0x8b, 0x2c, 0xa9, 0xb2, 0x04, 0x88, 0x1f,
-	0xd4, 0x1f, 0xd7, 0x5f, 0xd1, 0xd1, 0xde, 0xac, 0x0b, 0xa6, 0x03, 0x7c, 0xc9, 0x58, 0xe7, 0x3c,
-	0xe7, 0x39, 0xe7, 0x3c, 0xbb, 0x47, 0x27, 0x42, 0x77, 0xc2, 0x28, 0x88, 0x83, 0xa3, 0x98, 0xcf,
-	0xe2, 0xa3, 0x77, 0x0f, 0x8e, 0xc4, 0x53, 0x5b, 0x3c, 0xf6, 0x5d, 0xcf, 0xeb, 0xc7, 0x69, 0xc8,
-	0x67, 0x2d, 0x61, 0xc5, 0xd7, 0xc6, 0x41, 0x30, 0xf6, 0x78, 0xcb, 0x0d, 0x27, 0x2d, 0xfe, 0x21,
-	0x8c, 0x5a, 0x19, 0xaa, 0xf5, 0xee, 0x81, 0x74, 0xb7, 0x9b, 0x57, 0xa4, 0x5f, 0x72, 0x0c, 0x92,
-	0xf3, 0x23, 0xd7, 0x4f, 0xa5, 0xaf, 0x79, 0xad, 0xec, 0x1a, 0x25, 0x91, 0x1b, 0x4f, 0x02, 0x5f,
-	0xf9, 0xaf, 0x96, 0xfd, 0xb3, 0x38, 0x4a, 0x86, 0xb1, 0xf2, 0x5e, 0x2f, 0x7b, 0xe3, 0xc9, 0x94,
-	0xcf, 0x62, 0x77, 0x1a, 0x2e, 0xa2, 0x7f, 0x1f, 0xb9, 0x61, 0xc8, 0x23, 0x55, 0xf9, 0xfe, 0xdf,
-	0x4d, 0xb4, 0xf1, 0x92, 0xcf, 0xe2, 0x63, 0xcf, 0x7b, 0x99, 0x35, 0x84, 0x6f, 0xa3, 0x8d, 0xd9,
-	0xc4, 0x1f, 0x7b, 0xbc, 0x3f, 0xf1, 0xe3, 0x4e, 0x9b, 0x00, 0x0a, 0xd8, 0x72, 0x17, 0x1e, 0x76,
-	0xda, 0xce, 0xba, 0x74, 0xfc, 0x94, 0xd9, 0x8b, 0x38, 0xdb, 0x22, 0x35, 0x0a, 0x18, 0xec, 0xc2,
-	0x43, 0xdb, 0xca, 0xe1, 0x6c, 0x0b, 0x1f, 0xa0, 0xba, 0xc2, 0x25, 0x92, 0x10, 0x52, 0xc0, 0xea,
-	0xdd, 0x5a, 0xa7, 0xed, 0x28, 0x82, 0x57, 0xc2, 0x5e, 0x02, 0xda, 0x16, 0x59, 0xa2, 0x80, 0x2d,
-	0x75, 0x6b, 0xb6, 0x95, 0x07, 0xda, 0x16, 0xbe, 0x61, 0x80, 0x33, 0xc9, 0xb8, 0x4c, 0x01, 0xdb,
-	0xd6, 0xa0, 0x33, 0xc9, 0x56, 0x04, 0xd9, 0x16, 0xb9, 0x48, 0x01, 0xc3, 0x79, 0x90, 0x6d, 0xe1,
-	0x5b, 0x68, 0x53, 0x81, 0xce, 0x27, 0x1f, 0xf8, 0xa8, 0xd3, 0x26, 0x2b, 0x14, 0xb0, 0x15, 0x47,
-	0x85, 0x9e, 0x48, 0x63, 0x19, 0x66, 0x5b, 0x64, 0x95, 0x02, 0x76, 0xb1, 0x00, 0x13, 0x9d, 0x6e,
-	0xe9, 0x94, 0x9a, 0x6e, 0x8d, 0x02, 0xb6, 0xe5, 0xa8, 0xe8, 0x33, 0x65, 0xad, 0x00, 0x6d, 0x8b,
-	0x20, 0x0a, 0x58, 0xa3, 0x08, 0xb4, 0x2d, 0x7c, 0xd3, 0x68, 0x7c, 0xee, 0x05, 0x6e, 0x4c, 0xd6,
-	0x29, 0x60, 0xb5, 0x2e, 0xe8, 0x68, 0x85, 0x4f, 0x32, 0x2b, 0x66, 0xa6, 0xd5, 0x51, 0x90, 0x0c,
-	0x3c, 0x4e, 0x36, 0x28, 0x60, 0xa0, 0x0b, 0xed, 0x96, 0x51, 0xee, 0xb1, 0x70, 0xe0, 0x5b, 0x48,
-	0x05, 0xf6, 0x07, 0x41, 0xe0, 0x91, 0x3a, 0x05, 0x6c, 0xb5, 0xbb, 0x14, 0x47, 0x09, 0x77, 0x90,
-	0x74, 0xf4, 0x82, 0xc0, 0xc3, 0x77, 0xe7, 0xda, 0xc5, 0xd1, 0xc4, 0x1f, 0x93, 0x4d, 0x0a, 0xd8,
-	0x5a, 0x77, 0x99, 0x4f, 0xc3, 0x38, 0x35, 0x12, 0x0a, 0x17, 0x3e, 0x30, 0x25, 0x0e, 0xd2, 0x98,
-	0xcf, 0xc8, 0x16, 0x05, 0x6c, 0xa3, 0xbb, 0xe4, 0x07, 0x3e, 0xd7, 0x55, 0xf6, 0x32, 0x07, 0xee,
-	0x20, 0x95, 0xa2, 0xef, 0xfa, 0x29, 0x19, 0x51, 0xc0, 0xd6, 0xdb, 0xbb, 0x2d, 0x35, 0x37, 0xfa,
-	0x76, 0xb6, 0x8e, 0xfd, 0xd4, 0x59, 0x93, 0xb8, 0x63, 0x3f, 0xc5, 0x3d, 0xa3, 0x94, 0x9e, 0x0a,
-	0xc2, 0x45, 0xe4, 0x95, 0x4a, 0xe4, 0x63, 0x05, 0xd0, 0x22, 0xea, 0x67, 0xfc, 0x04, 0x35, 0x14,
-	0x87, 0x99, 0x0d, 0x72, 0x2e, 0x48, 0x9a, 0x15, 0x92, 0x97, 0x1a, 0xe1, 0xa8, 0xbc, 0xc6, 0x80,
-	0xbf, 0xcb, 0x8b, 0x92, 0x0c, 0x63, 0x32, 0x16, 0x1c, 0x97, 0x2b, 0x1c, 0x67, 0xc2, 0x9d, 0x93,
-	0x29, 0x19, 0xc6, 0xf8, 0xff, 0x46, 0xa6, 0x77, 0xae, 0x97, 0x70, 0xf2, 0x46, 0x04, 0x5f, 0xaa,
-	0x04, 0xff, 0x96, 0x79, 0xb5, 0x70, 0xe2, 0x01, 0x3f, 0x43, 0xbb, 0xf9, 0x41, 0xeb, 0xab, 0x01,
-	0x26, 0x13, 0x41, 0xf1, 0x9f, 0x0a, 0x85, 0x18, 0x3b, 0xc9, 0x83, 0x73, 0x83, 0xf8, 0xbb, 0x0c,
-	0x2b, 0xd2, 0x75, 0xda, 0x86, 0xee, 0x8f, 0xc5, 0x74, 0x9d, 0x76, 0x99, 0xae, 0xd3, 0xd6, 0x74,
-	0x2f, 0xd0, 0x5e, 0xe1, 0xf2, 0x19, 0xbe, 0xb7, 0x82, 0xef, 0x6a, 0xf5, 0x9c, 0x04, 0x4c, 0x12,
-	0xee, 0xe4, 0x6f, 0x67, 0xb5, 0x40, 0x71, 0xe9, 0x0d, 0xa1, 0xb7, 0xa0, 0x40, 0x31, 0x04, 0x85,
-	0x02, 0x85, 0xa5, 0x5a, 0x60, 0x52, 0xd4, 0x6f, 0xba, 0xa0, 0xc0, 0x57, 0x39, 0x01, 0x77, 0xf2,
-	0x2f, 0x9e, 0x4f, 0x33, 0xe6, 0x24, 0xf4, 0x3f, 0xc3, 0xa8, 0x35, 0xdc, 0xc9, 0xbf, 0xf3, 0xaa,
-	0x8c, 0x72, 0xe0, 0x0c, 0x63, 0xb0, 0x80, 0x51, 0x0e, 0x5f, 0x81, 0x51, 0x9a, 0x34, 0xe3, 0xcf,
-	0x68, 0x27, 0x37, 0xe9, 0x86, 0x2f, 0x5c, 0x70, 0xef, 0xb3, 0xb1, 0x97, 0x6c, 0xdb, 0xf3, 0xf7,
-	0x40, 0xf5, 0x40, 0xc4, 0x88, 0x1b, 0xb2, 0x3f, 0x17, 0x1c, 0x88, 0x98, 0xf7, 0xc2, 0x81, 0x08,
-	0x8b, 0xa6, 0x0b, 0x4d, 0xb3, 0x3e, 0x9f, 0xc5, 0x7c, 0xd4, 0x9f, 0xf2, 0xd9, 0xcc, 0x1d, 0x73,
-	0xb2, 0x27, 0xf8, 0xba, 0xad, 0xcf, 0xef, 0xd2, 0x56, 0x7e, 0x5b, 0xb5, 0x7e, 0x15, 0x14, 0xcf,
-	0x24, 0xc3, 0xd3, 0x0b, 0x5a, 0x8c, 0x82, 0x19, 0x7b, 0x08, 0x17, 0x33, 0x72, 0x3f, 0x99, 0x92,
-	0x4b, 0x14, 0xb0, 0xcd, 0xf6, 0xc3, 0xaf, 0x48, 0xf7, 0xc4, 0x4f, 0xa6, 0x5d, 0xd8, 0x3b, 0x76,
-	0x9e, 0x5e, 0x70, 0x1a, 0xf9, 0x84, 0x99, 0x23, 0xdb, 0x16, 0x11, 0x0f, 0xb9, 0x9b, 0x25, 0x92,
-	0xfb, 0xe9, 0x3a, 0x85, 0x6c, 0xd9, 0xa9, 0x6b, 0xab, 0xdc, 0x9f, 0x25, 0x98, 0x6d, 0x11, 0x4a,
-	0x21, 0x83, 0x05, 0x98, 0x5c, 0x2a, 0x06, 0xa6, 0x16, 0xe8, 0x7f, 0x29, 0x64, 0x75, 0xc7, 0x44,
-	0x9b, 0xf5, 0x59, 0x04, 0xda, 0x16, 0xd9, 0xa7, 0x90, 0x2d, 0x15, 0x81, 0x25, 0x46, 0xb5, 0x40,
-	0x6f, 0x50, 0xc8, 0xb6, 0xe7, 0xc0, 0xb3, 0x2a, 0xa3, 0x5a, 0xa2, 0x37, 0x29, 0x64, 0xb8, 0x08,
-	0xb4, 0x2d, 0x7c, 0x07, 0x35, 0x0c, 0x50, 0x6f, 0xbe, 0x5b, 0x14, 0xb2, 0x15, 0xc7, 0x10, 0xe8,
-	0x55, 0x5a, 0x81, 0xda, 0x16, 0xb9, 0x4d, 0x21, 0xbb, 0x58, 0x82, 0xda, 0x16, 0xbe, 0x87, 0xb6,
-	0xe7, 0xe9, 0x35, 0xed, 0x01, 0x85, 0x6c, 0xcb, 0x31, 0x1c, 0x66, 0xa5, 0x56, 0xc1, 0xb6, 0x45,
-	0x18, 0x85, 0xac, 0x51, 0x06, 0xcb, 0xb5, 0x3f, 0x2f, 0x42, 0x2c, 0xd6, 0x3b, 0x14, 0xb2, 0xda,
-	0x5c, 0x7a, 0xb9, 0x57, 0xf3, 0xfd, 0xab, 0xcd, 0x7a, 0x97, 0x42, 0x06, 0xe6, 0xfd, 0xab, 0xb5,
-	0x7a, 0x03, 0x99, 0x48, 0xb9, 0x58, 0xef, 0x51, 0xc8, 0x56, 0x9d, 0x0d, 0x6d, 0x14, 0x4b, 0xb5,
-	0xa0, 0xa6, 0x5c, 0xab, 0xf7, 0x29, 0x64, 0x6b, 0x39, 0x35, 0xe5, 0x46, 0xcd, 0x57, 0x27, 0x77,
-	0xea, 0x21, 0x85, 0x6c, 0x63, 0x5e, 0x9d, 0xdc, 0xa7, 0x11, 0xba, 0x6c, 0x60, 0xa5, 0x41, 0xea,
-	0x50, 0xf8, 0x6d, 0x83, 0xe4, 0xec, 0x69, 0xea, 0xe2, 0x20, 0x4d, 0xd0, 0x6e, 0x39, 0xa7, 0x18,
-	0x25, 0x8b, 0xc2, 0x6f, 0x18, 0x25, 0x07, 0x17, 0xb3, 0x89, 0x29, 0xb2, 0xd1, 0x5e, 0x49, 0xae,
-	0x7e, 0x38, 0xe1, 0x43, 0x4e, 0xfe, 0x97, 0x89, 0xd6, 0xab, 0xad, 0xd6, 0x9c, 0x9d, 0xa2, 0x70,
-	0x2f, 0x32, 0x77, 0xf6, 0x5f, 0xa4, 0x89, 0x1b, 0x06, 0xd1, 0x88, 0xd8, 0x0a, 0x0f, 0xe6, 0xe7,
-	0xf1, 0x63, 0x10, 0x8d, 0x70, 0x94, 0x4b, 0xe0, 0xb9, 0x1f, 0x53, 0xa3, 0xde, 0xc3, 0x6f, 0x55,
-	0xaf, 0x57, 0x63, 0x60, 0x5e, 0xdc, 0x2f, 0xee, 0xc7, 0x54, 0xeb, 0x37, 0x45, 0xdb, 0x53, 0x37,
-	0xd4, 0xfd, 0xa8, 0x5b, 0xf0, 0xbd, 0xc8, 0x77, 0xfc, 0x45, 0xf9, 0x9e, 0xb9, 0xa1, 0x6c, 0x5a,
-	0xfe, 0x7d, 0xe2, 0xc7, 0x51, 0xea, 0x6c, 0x4d, 0x8b, 0x56, 0xfc, 0x1e, 0xed, 0x65, 0xe9, 0xe4,
-	0xda, 0x53, 0xe7, 0x95, 0x7d, 0xb5, 0x90, 0x1f, 0x44, 0xca, 0xc7, 0x5f, 0x9a, 0x52, 0xbc, 0x91,
-	0x64, 0xab, 0x99, 0x4d, 0x66, 0xc5, 0xd3, 0x8a, 0xa3, 0x79, 0x1d, 0xd5, 0x8b, 0x17, 0x67, 0x13,
-	0xd5, 0x06, 0x03, 0xf9, 0x29, 0xe1, 0xd4, 0x06, 0x83, 0x66, 0x0f, 0xed, 0x7e, 0xaa, 0x05, 0xdc,
-	0x40, 0xf0, 0x2d, 0x4f, 0x05, 0x70, 0xcd, 0xc9, 0x7e, 0xe2, 0x5d, 0xb4, 0x2c, 0xff, 0x63, 0xaa,
-	0x09, 0x9b, 0x7c, 0xe8, 0xd6, 0x1e, 0x81, 0x66, 0x8a, 0x2e, 0x2f, 0xa8, 0x29, 0x4f, 0x03, 0x25,
-	0xcd, 0xd3, 0x3c, 0xcd, 0x7a, 0xbb, 0xfd, 0x6f, 0xad, 0x2b, 0xc6, 0x9c, 0x00, 0xb9, 0xd4, 0xfb,
-	0x07, 0x08, 0xe5, 0xae, 0xea, 0x0a, 0x82, 0x27, 0xcf, 0x9f, 0x37, 0x2e, 0x64, 0x3f, 0x7a, 0xc7,
-	0x4e, 0x03, 0xc8, 0x1f, 0xaf, 0x1b, 0xb5, 0x5e, 0x1d, 0xad, 0xe7, 0x74, 0xdf, 0xff, 0x0b, 0x20,
-	0x5c, 0x65, 0xce, 0x8a, 0x1b, 0xbe, 0x99, 0x78, 0x23, 0x51, 0xf0, 0x57, 0x16, 0x27, 0x08, 0xf0,
-	0x09, 0x5a, 0x09, 0xdd, 0xd4, 0x0b, 0xdc, 0x91, 0x6a, 0xf4, 0xfe, 0x97, 0x9c, 0xb1, 0xa3, 0x83,
-	0xef, 0x1e, 0x20, 0x74, 0xea, 0x05, 0x03, 0xd7, 0xd3, 0x0d, 0x9e, 0xea, 0x06, 0x4f, 0x75, 0x83,
-	0xa7, 0xa2, 0xc1, 0xee, 0xeb, 0x47, 0xe3, 0x49, 0xfc, 0x26, 0x19, 0xb4, 0x86, 0xc1, 0xf4, 0x48,
-	0x7d, 0x6b, 0x0e, 0xb9, 0x77, 0x38, 0x0b, 0xf9, 0xf0, 0xf3, 0x9f, 0xce, 0xff, 0x04, 0x00, 0x00,
-	0xff, 0xff, 0x8a, 0xfb, 0x6f, 0x8d, 0x60, 0x0f, 0x00, 0x00,
+	// 1403 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0x7d, 0x73, 0xd3, 0xc6,
+	0x13, 0x46, 0xba, 0x84, 0x24, 0x97, 0x38, 0x71, 0x2e, 0x09, 0x39, 0xf2, 0x63, 0xe0, 0x7e, 0x81,
+	0x90, 0xe3, 0x25, 0xce, 0x60, 0x0b, 0x41, 0x3d, 0x6d, 0x67, 0xe2, 0x42, 0x42, 0x3b, 0xa5, 0x30,
+	0x0a, 0xb4, 0x33, 0xfc, 0xe3, 0xca, 0xf6, 0xc5, 0xa8, 0xc8, 0x92, 0x90, 0x25, 0xc0, 0x7c, 0xa0,
+	0x7e, 0x85, 0x7e, 0xbd, 0x8e, 0xee, 0xcd, 0x7a, 0xc1, 0x74, 0x42, 0xfe, 0xc9, 0x58, 0xbb, 0xcf,
+	0x3d, 0xbb, 0xfb, 0xe8, 0xf6, 0x6e, 0x15, 0x78, 0x27, 0x8a, 0xc3, 0x24, 0x3c, 0x4c, 0xd8, 0x38,
+	0x39, 0xfc, 0xf0, 0xe0, 0x90, 0x3f, 0x35, 0xf9, 0x63, 0xd7, 0xf5, 0xfd, 0x6e, 0x32, 0x89, 0xd8,
+	0xb8, 0xc1, 0xad, 0xe8, 0xfa, 0x30, 0x0c, 0x87, 0x3e, 0x6b, 0xb8, 0x91, 0xd7, 0x60, 0x9f, 0xa2,
+	0xb8, 0x91, 0xa1, 0x1a, 0x1f, 0x1e, 0x08, 0x77, 0x73, 0xe7, 0xaa, 0xf0, 0x0b, 0x8e, 0x5e, 0x7a,
+	0x76, 0xe8, 0x06, 0x13, 0xe1, 0xdb, 0xb9, 0x5e, 0x76, 0x0d, 0xd2, 0xd8, 0x4d, 0xbc, 0x30, 0x90,
+	0xfe, 0x6b, 0x65, 0xff, 0x38, 0x89, 0xd3, 0x7e, 0x22, 0xbd, 0x37, 0xca, 0xde, 0xc4, 0x1b, 0xb1,
+	0x71, 0xe2, 0x8e, 0xa2, 0x59, 0xf4, 0x1f, 0x63, 0x37, 0x8a, 0x58, 0x2c, 0x33, 0xdf, 0xfd, 0xe7,
+	0x1a, 0x5c, 0x79, 0xc5, 0xc6, 0xc9, 0x91, 0xef, 0xbf, 0xca, 0x0a, 0x42, 0xb7, 0xe1, 0xca, 0xd8,
+	0x0b, 0x86, 0x3e, 0xeb, 0x7a, 0x41, 0xd2, 0x6a, 0x62, 0x83, 0x18, 0x74, 0xbe, 0x0d, 0x0e, 0x5a,
+	0x4d, 0x67, 0x59, 0x38, 0x7e, 0xce, 0xec, 0x45, 0x9c, 0x6d, 0x61, 0x93, 0x18, 0x14, 0xb4, 0xc1,
+	0x81, 0x6d, 0xe5, 0x70, 0xb6, 0x85, 0xf6, 0x61, 0x4d, 0xe2, 0x52, 0x41, 0x08, 0x88, 0x41, 0x6b,
+	0x6d, 0xb3, 0xd5, 0x74, 0x24, 0xc1, 0x6b, 0x6e, 0x2f, 0x01, 0x6d, 0x0b, 0xcf, 0x11, 0x83, 0xce,
+	0xb5, 0x4d, 0xdb, 0xca, 0x03, 0x6d, 0x0b, 0xdd, 0xd4, 0xc0, 0xb1, 0x60, 0x9c, 0x27, 0x06, 0x5d,
+	0x57, 0xa0, 0x53, 0xc1, 0x56, 0x04, 0xd9, 0x16, 0xbe, 0x4c, 0x0c, 0x8a, 0xf2, 0x20, 0xdb, 0x42,
+	0x7b, 0x70, 0x55, 0x82, 0xce, 0xbc, 0x4f, 0x6c, 0xd0, 0x6a, 0xe2, 0x05, 0x62, 0xd0, 0x05, 0x47,
+	0x2e, 0x3d, 0x16, 0xc6, 0x32, 0xcc, 0xb6, 0xf0, 0x22, 0x31, 0xe8, 0xe5, 0x02, 0x8c, 0x57, 0xba,
+	0xa6, 0x42, 0x2a, 0xba, 0x25, 0x62, 0xd0, 0x35, 0x47, 0xae, 0x3e, 0x95, 0xd6, 0x0a, 0xd0, 0xb6,
+	0x30, 0x24, 0x06, 0xad, 0x17, 0x81, 0xb6, 0x85, 0x6e, 0x69, 0x8d, 0xcf, 0xfc, 0xd0, 0x4d, 0xf0,
+	0x32, 0x31, 0xa8, 0xd9, 0x36, 0x5a, 0x4a, 0xe1, 0xe3, 0xcc, 0x8a, 0xa8, 0x2e, 0x75, 0x10, 0xa6,
+	0x3d, 0x9f, 0xe1, 0x15, 0x62, 0x50, 0xa3, 0x0d, 0xec, 0x86, 0x56, 0xee, 0x09, 0x77, 0xa0, 0x3d,
+	0x28, 0x17, 0x76, 0x7b, 0x61, 0xe8, 0xe3, 0x1a, 0x31, 0xe8, 0x62, 0x7b, 0x2e, 0x89, 0x53, 0xe6,
+	0x40, 0xe1, 0xe8, 0x84, 0xa1, 0x8f, 0xee, 0x4e, 0xb5, 0x4b, 0x62, 0x2f, 0x18, 0xe2, 0x55, 0x62,
+	0xd0, 0xa5, 0xf6, 0x3c, 0x1b, 0x45, 0xc9, 0x44, 0x4b, 0xc8, 0x5d, 0x68, 0x5f, 0xa7, 0xd8, 0x9b,
+	0x24, 0x6c, 0x8c, 0xd7, 0x88, 0x41, 0x57, 0xda, 0x73, 0x41, 0x18, 0x30, 0x95, 0x65, 0x27, 0x73,
+	0xa0, 0x16, 0x94, 0x21, 0xba, 0x6e, 0x30, 0xc1, 0x03, 0x62, 0xd0, 0xe5, 0xe6, 0x66, 0x43, 0xf6,
+	0x8d, 0xda, 0x9d, 0x8d, 0xa3, 0x60, 0xe2, 0x2c, 0x09, 0xdc, 0x51, 0x30, 0x41, 0x1d, 0xad, 0x94,
+	0xea, 0x0a, 0xcc, 0xf8, 0xca, 0xab, 0x95, 0x95, 0x4f, 0x24, 0x40, 0x89, 0xa8, 0x9e, 0xd1, 0x53,
+	0x58, 0x97, 0x1c, 0xba, 0x37, 0xf0, 0x19, 0x27, 0xd9, 0xa9, 0x90, 0xbc, 0x52, 0x08, 0x47, 0xc6,
+	0xd5, 0x06, 0xf4, 0x7d, 0x5e, 0x94, 0xb4, 0x9f, 0xe0, 0x21, 0xe7, 0xd8, 0xae, 0x70, 0x9c, 0x72,
+	0x77, 0x4e, 0xa6, 0xb4, 0x9f, 0xa0, 0xef, 0xb4, 0x4c, 0x1f, 0x5c, 0x3f, 0x65, 0xf8, 0x2d, 0x5f,
+	0x7c, 0xa5, 0xb2, 0xf8, 0xf7, 0xcc, 0xab, 0x84, 0xe3, 0x0f, 0xe8, 0x39, 0xdc, 0xcc, 0x37, 0x5a,
+	0x57, 0x36, 0x30, 0xf6, 0x38, 0xc5, 0xff, 0x2a, 0x14, 0xbc, 0xed, 0x04, 0x0f, 0xca, 0x35, 0xe2,
+	0x1f, 0x62, 0x59, 0x91, 0xae, 0xd5, 0xd4, 0x74, 0x7f, 0xcd, 0xa6, 0x6b, 0x35, 0xcb, 0x74, 0xad,
+	0xa6, 0xa2, 0x7b, 0x09, 0xb7, 0x0a, 0x9b, 0x4f, 0xf3, 0xbd, 0xe3, 0x7c, 0xd7, 0xaa, 0xef, 0x89,
+	0xc3, 0x04, 0xe1, 0x46, 0x7e, 0x77, 0x56, 0x13, 0xe4, 0x9b, 0x5e, 0x13, 0xfa, 0x33, 0x12, 0xe4,
+	0x4d, 0x50, 0x48, 0x90, 0x5b, 0xaa, 0x09, 0xa6, 0x45, 0xfd, 0x46, 0x33, 0x12, 0x7c, 0x9d, 0x13,
+	0x70, 0x23, 0x7f, 0xf0, 0x7c, 0x99, 0x31, 0x27, 0x61, 0xf0, 0x15, 0x46, 0xa5, 0xe1, 0x46, 0xfe,
+	0xcc, 0xab, 0x32, 0x8a, 0x86, 0xd3, 0x8c, 0xe1, 0x0c, 0x46, 0xd1, 0x7c, 0x05, 0x46, 0x61, 0x52,
+	0x8c, 0xbf, 0xc0, 0x8d, 0x5c, 0xa7, 0x6b, 0xbe, 0x68, 0xc6, 0xbe, 0xcf, 0xda, 0x5e, 0xb0, 0xad,
+	0x4f, 0xcf, 0x81, 0xea, 0x0b, 0xe1, 0x2d, 0xae, 0xc9, 0xde, 0xcf, 0x78, 0x21, 0xbc, 0xdf, 0x0b,
+	0x2f, 0x84, 0x5b, 0x14, 0x5d, 0xa4, 0x8b, 0x0d, 0xd8, 0x38, 0x61, 0x83, 0xee, 0x88, 0x8d, 0xc7,
+	0xee, 0x90, 0xe1, 0x2d, 0xce, 0xd7, 0x6e, 0x7c, 0xfd, 0x2e, 0x6d, 0xe4, 0x6f, 0xab, 0xc6, 0x6f,
+	0x9c, 0xe2, 0xb9, 0x60, 0x78, 0x76, 0x49, 0x89, 0x51, 0x30, 0x23, 0x1f, 0xa2, 0x62, 0x44, 0x16,
+	0xa4, 0x23, 0x7c, 0x85, 0x18, 0x74, 0xb5, 0xf9, 0xe8, 0x1b, 0xc2, 0x3d, 0x0d, 0xd2, 0x51, 0x1b,
+	0x74, 0x8e, 0x9c, 0x67, 0x97, 0x9c, 0x7a, 0x3e, 0x60, 0xe6, 0x40, 0x1e, 0x44, 0xe3, 0xc4, 0x0d,
+	0x06, 0xae, 0x1f, 0x06, 0x4c, 0x17, 0xb7, 0x7d, 0xd1, 0xe2, 0x9c, 0xf5, 0x29, 0xab, 0x2a, 0xec,
+	0x4f, 0xb8, 0x96, 0x0b, 0xc5, 0xab, 0xc2, 0x17, 0xaa, 0xca, 0x59, 0x9d, 0xf2, 0xf1, 0x62, 0xf6,
+	0xe0, 0x6a, 0xcc, 0x22, 0xe6, 0x66, 0xaa, 0x89, 0xcb, 0xf6, 0x06, 0x01, 0x74, 0xde, 0xa9, 0x29,
+	0xab, 0x18, 0x06, 0x4a, 0x30, 0xdb, 0xc2, 0x84, 0x00, 0x0a, 0x0a, 0x30, 0x71, 0x43, 0x6a, 0x98,
+	0x9c, 0x06, 0xfe, 0x4f, 0x00, 0xad, 0x39, 0x7a, 0xb5, 0x9e, 0x05, 0x8a, 0x40, 0xdb, 0xc2, 0xbb,
+	0x04, 0xd0, 0xb9, 0x22, 0xb0, 0xc4, 0x28, 0xa7, 0x81, 0x9b, 0x04, 0xd0, 0xf5, 0x29, 0xf0, 0xb4,
+	0xca, 0x28, 0x27, 0x82, 0x5b, 0x04, 0x50, 0x54, 0x04, 0xda, 0x16, 0xba, 0x03, 0xeb, 0x1a, 0xa8,
+	0xae, 0xf1, 0x3d, 0x02, 0xe8, 0x82, 0xa3, 0x09, 0xd4, 0x5c, 0x50, 0x81, 0xda, 0x16, 0xbe, 0x4d,
+	0x00, 0xbd, 0x5c, 0x82, 0xda, 0x16, 0xba, 0x07, 0xd7, 0xa7, 0xe1, 0x15, 0xed, 0x3e, 0x01, 0x74,
+	0xcd, 0xd1, 0x1c, 0x7a, 0x3e, 0xa8, 0x82, 0x6d, 0x0b, 0x53, 0x02, 0x68, 0xbd, 0x0c, 0x16, 0x33,
+	0xcc, 0x34, 0x09, 0x3e, 0x25, 0xdc, 0x21, 0x80, 0x9a, 0x53, 0xe9, 0xc5, 0x90, 0x90, 0xaf, 0x5f,
+	0x8e, 0x09, 0x77, 0x09, 0xa0, 0xc6, 0xb4, 0x7e, 0x39, 0x23, 0xdc, 0x84, 0x7a, 0xa5, 0x98, 0x12,
+	0xee, 0x11, 0x40, 0x17, 0x9d, 0x15, 0x65, 0xe4, 0x13, 0x42, 0x41, 0x4d, 0x31, 0x23, 0xdc, 0x27,
+	0x80, 0x2e, 0xe5, 0xd4, 0x14, 0xe3, 0x41, 0x3e, 0x3b, 0x31, 0x20, 0x1c, 0x10, 0x40, 0x57, 0xa6,
+	0xd9, 0x89, 0xe1, 0x20, 0x86, 0xdb, 0x1a, 0x56, 0x3a, 0x15, 0x5a, 0x04, 0x5c, 0xb0, 0x71, 0xb6,
+	0x14, 0x75, 0xf1, 0x54, 0xf0, 0xe0, 0x66, 0x39, 0x26, 0xef, 0x20, 0x8b, 0x80, 0x8b, 0x74, 0x10,
+	0x2a, 0x46, 0xe3, 0x5d, 0x64, 0xc3, 0xad, 0x92, 0x5c, 0xdd, 0xc8, 0x63, 0x7d, 0x86, 0x1f, 0x66,
+	0xa2, 0x75, 0xcc, 0x45, 0xd3, 0xd9, 0x28, 0x0a, 0xf7, 0x32, 0x73, 0x67, 0x23, 0xb1, 0x5e, 0xd7,
+	0x0f, 0xe3, 0x01, 0xb6, 0x25, 0xde, 0x98, 0xbe, 0x8f, 0x9f, 0xc2, 0x78, 0x80, 0xe2, 0x5c, 0x00,
+	0xdf, 0xfd, 0x3c, 0xd1, 0xea, 0x3d, 0xba, 0xa8, 0x7a, 0x1d, 0x93, 0x1a, 0xd3, 0xe4, 0x7e, 0x75,
+	0x3f, 0x4f, 0x94, 0x7e, 0x23, 0xb8, 0x3e, 0x72, 0x23, 0x55, 0x8f, 0xdc, 0x05, 0x3f, 0xf0, 0x78,
+	0x47, 0xe7, 0x8a, 0xf7, 0xdc, 0x8d, 0x44, 0xd1, 0xe2, 0xef, 0xd3, 0x20, 0x89, 0x27, 0xce, 0xda,
+	0xa8, 0x68, 0x45, 0x1f, 0xe1, 0x56, 0x16, 0x4e, 0xdc, 0xe1, 0xf2, 0x7d, 0x65, 0x9f, 0x60, 0xf8,
+	0x47, 0x1e, 0xf2, 0xc9, 0x79, 0x43, 0xf2, 0x13, 0x49, 0x94, 0x9a, 0xd9, 0x44, 0x54, 0x34, 0xaa,
+	0x38, 0x76, 0x6e, 0xc0, 0x5a, 0x71, 0xe3, 0xac, 0x42, 0xb3, 0xd7, 0x13, 0xdf, 0x45, 0x8e, 0xd9,
+	0xeb, 0xed, 0x74, 0xe0, 0xe6, 0x97, 0x4a, 0x40, 0x75, 0x08, 0xde, 0xb1, 0x09, 0x07, 0x2e, 0x39,
+	0xd9, 0x4f, 0xb4, 0x09, 0xe7, 0xc5, 0xf8, 0x67, 0x72, 0x9b, 0x78, 0x68, 0x9b, 0x8f, 0x8d, 0x9d,
+	0x09, 0xdc, 0x9e, 0x91, 0x53, 0x9e, 0x06, 0x08, 0x9a, 0x67, 0x79, 0x9a, 0xe5, 0x66, 0xf3, 0xbf,
+	0x4a, 0x97, 0x8c, 0x39, 0x01, 0x72, 0xa1, 0x77, 0xf7, 0x21, 0xcc, 0x6d, 0xd5, 0x05, 0x08, 0x8e,
+	0x5f, 0xbc, 0xa8, 0x5f, 0xca, 0x7e, 0x74, 0x8e, 0x9c, 0xba, 0x21, 0x7e, 0xbc, 0xa9, 0x9b, 0x9d,
+	0x1a, 0x5c, 0xce, 0xe9, 0xbe, 0xfb, 0xb7, 0x01, 0x51, 0x95, 0x39, 0x4b, 0xae, 0xff, 0xd6, 0xf3,
+	0x07, 0x3c, 0xe1, 0x6f, 0x4c, 0x8e, 0x13, 0xa0, 0x63, 0xb8, 0x10, 0xb9, 0x13, 0x3f, 0x74, 0x07,
+	0xb2, 0xd0, 0xfb, 0xe7, 0x79, 0xc7, 0x8e, 0x5a, 0xbc, 0xfb, 0x50, 0x7c, 0xe1, 0x3a, 0xec, 0x7d,
+	0xea, 0xc5, 0x6c, 0x20, 0xce, 0x24, 0xf1, 0x5b, 0x7f, 0xe3, 0x9a, 0xe2, 0x4e, 0x13, 0x56, 0x7e,
+	0xa7, 0xdd, 0xdd, 0x87, 0xf0, 0xc4, 0x0f, 0x7b, 0xae, 0xaf, 0x74, 0x39, 0x51, 0xba, 0x9c, 0x28,
+	0x5d, 0x4e, 0xb8, 0x2e, 0xed, 0x37, 0x8f, 0x87, 0x5e, 0xf2, 0x36, 0xed, 0x35, 0xfa, 0xe1, 0xe8,
+	0x50, 0x7e, 0x6f, 0xf7, 0x99, 0x7f, 0x30, 0x8e, 0x58, 0xff, 0xeb, 0xff, 0x3e, 0xf8, 0x37, 0x00,
+	0x00, 0xff, 0xff, 0x21, 0x77, 0xe0, 0x3d, 0x64, 0x10, 0x00, 0x00,
 }
diff --git a/proto/test/v1/proto3/test_all_types.proto b/proto/test/v1/proto3/test_all_types.proto
index 0855d98f..2b177762 100644
--- a/proto/test/v1/proto3/test_all_types.proto
+++ b/proto/test/v1/proto3/test_all_types.proto
@@ -65,6 +65,8 @@ message TestAllTypes {
     NestedMessage single_nested_message = 21;
     NestedEnum single_nested_enum = 22;
   }
+  NestedMessage standalone_message = 23;
+  NestedEnum standalone_enum = 24;
 
   // Repeated
   repeated int32 repeated_int32 = 31;
diff --git a/proto/test/v1/proto3/test_all_types/test_all_types.pb.go b/proto/test/v1/proto3/test_all_types/test_all_types.pb.go
index c0d26433..c495239e 100755
--- a/proto/test/v1/proto3/test_all_types/test_all_types.pb.go
+++ b/proto/test/v1/proto3/test_all_types/test_all_types.pb.go
@@ -115,6 +115,8 @@ type TestAllTypes struct {
 	//	*TestAllTypes_SingleNestedMessage
 	//	*TestAllTypes_SingleNestedEnum
 	NestedType            isTestAllTypes_NestedType     `protobuf_oneof:"nested_type"`
+	StandaloneMessage     *TestAllTypes_NestedMessage   `protobuf:"bytes,23,opt,name=standalone_message,json=standaloneMessage,proto3" json:"standalone_message,omitempty"`
+	StandaloneEnum        TestAllTypes_NestedEnum       `protobuf:"varint,24,opt,name=standalone_enum,json=standaloneEnum,proto3,enum=google.api.expr.test.v1.proto3.TestAllTypes_NestedEnum" json:"standalone_enum,omitempty"`
 	RepeatedInt32         []int32                       `protobuf:"varint,31,rep,packed,name=repeated_int32,json=repeatedInt32,proto3" json:"repeated_int32,omitempty"`
 	RepeatedInt64         []int64                       `protobuf:"varint,32,rep,packed,name=repeated_int64,json=repeatedInt64,proto3" json:"repeated_int64,omitempty"`
 	RepeatedUint32        []uint32                      `protobuf:"varint,33,rep,packed,name=repeated_uint32,json=repeatedUint32,proto3" json:"repeated_uint32,omitempty"`
@@ -407,6 +409,20 @@ func (m *TestAllTypes) GetSingleNestedEnum() TestAllTypes_NestedEnum {
 	return TestAllTypes_FOO
 }
 
+func (m *TestAllTypes) GetStandaloneMessage() *TestAllTypes_NestedMessage {
+	if m != nil {
+		return m.StandaloneMessage
+	}
+	return nil
+}
+
+func (m *TestAllTypes) GetStandaloneEnum() TestAllTypes_NestedEnum {
+	if m != nil {
+		return m.StandaloneEnum
+	}
+	return TestAllTypes_FOO
+}
+
 func (m *TestAllTypes) GetRepeatedInt32() []int32 {
 	if m != nil {
 		return m.RepeatedInt32
@@ -670,86 +686,88 @@ func init() {
 }
 
 var fileDescriptor_a2e70c0487903069 = []byte{
-	// 1289 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0x6b, 0x73, 0xd3, 0x46,
-	0x17, 0xc7, 0x59, 0x8b, 0xdc, 0x36, 0x76, 0xe2, 0x6c, 0x12, 0x58, 0xfc, 0x30, 0x64, 0x09, 0x0f,
-	0xcd, 0x72, 0x73, 0x06, 0x5b, 0x15, 0x94, 0x69, 0x3b, 0x13, 0x17, 0x12, 0xda, 0x29, 0x85, 0x51,
-	0xa0, 0x9d, 0xe1, 0x8d, 0x47, 0xb6, 0x37, 0x46, 0x45, 0x96, 0x54, 0x5d, 0x00, 0xf1, 0x81, 0xfa,
-	0x19, 0xfa, 0xf1, 0x3a, 0xda, 0x8b, 0xbc, 0x92, 0x30, 0x1d, 0xc8, 0x9b, 0x8c, 0x75, 0xf6, 0xbf,
-	0xbf, 0x73, 0xd9, 0x3d, 0x3a, 0x11, 0xbc, 0x15, 0x46, 0x41, 0x12, 0x1c, 0x26, 0x2c, 0x4e, 0x0e,
-	0xdf, 0xdd, 0x3f, 0xe4, 0x4f, 0x7d, 0xfe, 0x38, 0x74, 0x3c, 0x6f, 0x98, 0x64, 0x21, 0x8b, 0xbb,
-	0xdc, 0x8a, 0xae, 0x4d, 0x83, 0x60, 0xea, 0xb1, 0xae, 0x13, 0xba, 0x5d, 0xf6, 0x21, 0x8c, 0xba,
-	0xb9, 0xaa, 0xfb, 0xee, 0xbe, 0x58, 0xee, 0x77, 0xae, 0x88, 0x75, 0xc1, 0x18, 0xa5, 0x67, 0x87,
-	0x8e, 0x9f, 0x89, 0xb5, 0xce, 0xb5, 0xea, 0xd2, 0x24, 0x8d, 0x9c, 0xc4, 0x0d, 0x7c, 0xb9, 0x7e,
-	0xb5, 0xba, 0x1e, 0x27, 0x51, 0x3a, 0x4e, 0xe4, 0xea, 0x5e, 0x75, 0x35, 0x71, 0x67, 0x2c, 0x4e,
-	0x9c, 0x59, 0xb8, 0x08, 0xff, 0x3e, 0x72, 0xc2, 0x90, 0x45, 0x32, 0xf2, 0xfd, 0x7f, 0x3a, 0xb0,
-	0xf9, 0x92, 0xc5, 0xc9, 0x91, 0xe7, 0xbd, 0xcc, 0x13, 0x42, 0xd7, 0x61, 0x33, 0x76, 0xfd, 0xa9,
-	0xc7, 0x86, 0xae, 0x9f, 0xf4, 0x7b, 0x18, 0x10, 0x40, 0x97, 0xec, 0x75, 0x61, 0xfb, 0x39, 0x37,
-	0x95, 0x25, 0x96, 0x89, 0x1b, 0x04, 0x50, 0x43, 0x93, 0x58, 0x26, 0xba, 0x01, 0x5b, 0x52, 0x92,
-	0x0a, 0x8c, 0x41, 0x00, 0x6d, 0xd9, 0x72, 0xdf, 0x2b, 0x6e, 0xab, 0x88, 0x2c, 0x13, 0x5f, 0x24,
-	0x80, 0x5e, 0xd4, 0x45, 0x25, 0x52, 0x2c, 0x48, 0x4b, 0x04, 0xd0, 0x2d, 0x25, 0x3a, 0xad, 0x92,
-	0x62, 0x41, 0x5a, 0x26, 0x80, 0x22, 0x5d, 0x64, 0x99, 0xe8, 0x26, 0xdc, 0x90, 0xa2, 0x33, 0xf7,
-	0x03, 0x9b, 0xf4, 0x7b, 0x78, 0x85, 0x00, 0xba, 0x62, 0xcb, 0xad, 0xc7, 0xc2, 0x58, 0x95, 0x59,
-	0x26, 0x5e, 0x25, 0x80, 0x2e, 0x97, 0x64, 0x96, 0x89, 0x0e, 0xe0, 0xa6, 0x72, 0xa9, 0x70, 0x6b,
-	0x04, 0xd0, 0x4d, 0x5b, 0xee, 0x3e, 0x95, 0xd6, 0x9a, 0xd0, 0x32, 0x31, 0x24, 0x80, 0xb6, 0xcb,
-	0x42, 0xcb, 0xd4, 0xca, 0x7a, 0xe6, 0x05, 0x4e, 0x82, 0xd7, 0x09, 0xa0, 0x0d, 0x55, 0xd6, 0xe3,
-	0xdc, 0xa4, 0xe5, 0x39, 0x09, 0xd2, 0x91, 0xc7, 0x70, 0x93, 0x00, 0x0a, 0x54, 0x9e, 0x8f, 0xb9,
-	0x0d, 0xed, 0x41, 0xb9, 0x67, 0x38, 0x0a, 0x02, 0x0f, 0xb7, 0x08, 0xa0, 0xab, 0x36, 0x14, 0xa6,
-	0x41, 0x10, 0x78, 0x7a, 0xb5, 0x92, 0xc8, 0xf5, 0xa7, 0x78, 0x83, 0x00, 0xba, 0x56, 0x54, 0x8b,
-	0xdb, 0xb4, 0x68, 0x46, 0x59, 0xc2, 0x62, 0xbc, 0x49, 0x00, 0x6d, 0xaa, 0x68, 0x06, 0xb9, 0x09,
-	0xf5, 0xa1, 0xa4, 0x0e, 0x1d, 0x3f, 0xc3, 0x13, 0x02, 0xe8, 0x7a, 0x6f, 0xa7, 0x2b, 0x5b, 0x41,
-	0x5d, 0xb8, 0xee, 0x91, 0x9f, 0xd9, 0x6b, 0x42, 0x77, 0xe4, 0x67, 0x68, 0x50, 0x94, 0x43, 0x5d,
-	0x74, 0xcc, 0xf8, 0xce, 0x2b, 0xb5, 0x9d, 0x8f, 0xa5, 0x40, 0x55, 0x4a, 0x3d, 0xa3, 0x27, 0xb0,
-	0x2d, 0x19, 0xc5, 0x75, 0xc7, 0x67, 0x1c, 0xd2, 0xa9, 0x41, 0x5e, 0x2a, 0x85, 0x2d, 0xfd, 0x16,
-	0x06, 0xf4, 0xbd, 0x5e, 0x87, 0x74, 0x9c, 0xe0, 0x29, 0x67, 0x5c, 0xae, 0x31, 0x4e, 0xf9, 0xb2,
-	0x56, 0xa0, 0x74, 0x9c, 0xa0, 0xef, 0x8a, 0x02, 0xbd, 0x73, 0xbc, 0x94, 0xe1, 0x37, 0x7c, 0xf3,
-	0xa5, 0xda, 0xe6, 0xdf, 0xf3, 0x55, 0x55, 0x38, 0xfe, 0x80, 0x9e, 0xc1, 0x1d, 0xbd, 0x81, 0x86,
-	0xb2, 0x27, 0xb1, 0xcb, 0x11, 0xff, 0xab, 0x21, 0x78, 0x4f, 0x09, 0x0e, 0xd2, 0xba, 0xec, 0x0f,
-	0xb1, 0xad, 0x8c, 0xeb, 0xf7, 0x0a, 0xdc, 0x9f, 0x8b, 0x71, 0xfd, 0x5e, 0x15, 0xd7, 0xef, 0x29,
-	0xdc, 0x0b, 0xb8, 0x5b, 0xba, 0x64, 0x05, 0xef, 0x2d, 0xe7, 0x5d, 0xad, 0x9f, 0x13, 0x97, 0x09,
-	0xe0, 0xb6, 0x7e, 0x15, 0xeb, 0x01, 0xf2, 0x9b, 0x5d, 0x00, 0xbd, 0x05, 0x01, 0xf2, 0xcb, 0x5e,
-	0x0a, 0x90, 0x5b, 0xea, 0x01, 0xa6, 0xe5, 0xfa, 0xcd, 0x16, 0x04, 0xf8, 0x4a, 0x2b, 0xe0, 0xb6,
-	0xfe, 0x76, 0xf9, 0x34, 0x51, 0x2b, 0xa1, 0xff, 0x19, 0xa2, 0xaa, 0xe1, 0xb6, 0xfe, 0x52, 0xab,
-	0x13, 0x45, 0x8f, 0x15, 0xc4, 0x60, 0x01, 0x51, 0xb4, 0x5d, 0x89, 0x28, 0x4c, 0x8a, 0xf8, 0x0b,
-	0xdc, 0xd6, 0xda, 0xba, 0xe0, 0x85, 0x0b, 0xee, 0x7d, 0xde, 0xe9, 0x82, 0xb6, 0x35, 0x6f, 0xfd,
-	0xfa, 0x81, 0xf0, 0xe6, 0x2e, 0x60, 0x7f, 0x2d, 0x38, 0x10, 0xde, 0xef, 0xa5, 0x03, 0xe1, 0x16,
-	0x85, 0x0b, 0x8b, 0x64, 0x7d, 0x16, 0x27, 0x6c, 0x32, 0x9c, 0xb1, 0x38, 0x76, 0xa6, 0x0c, 0xef,
-	0x72, 0xde, 0xa3, 0xee, 0xe7, 0xc7, 0x63, 0x57, 0x1f, 0x40, 0xdd, 0xdf, 0x38, 0xe2, 0x99, 0x20,
-	0x3c, 0xbd, 0xa0, 0x8a, 0x51, 0x32, 0xa3, 0x29, 0x44, 0x65, 0x8f, 0xcc, 0x4f, 0x67, 0xf8, 0x12,
-	0x01, 0x74, 0xa3, 0xf7, 0xe0, 0x2b, 0xdc, 0x3d, 0xf1, 0xd3, 0xd9, 0xd3, 0x0b, 0x76, 0x5b, 0xf7,
-	0x95, 0xdb, 0xf2, 0x69, 0x10, 0xb1, 0x90, 0x39, 0xb9, 0x0f, 0x31, 0x7f, 0xf6, 0x88, 0x41, 0x97,
-	0xec, 0x96, 0xb2, 0x8a, 0x91, 0x58, 0x91, 0x59, 0x26, 0x26, 0xc4, 0xa0, 0x46, 0x49, 0x26, 0x86,
-	0x46, 0x21, 0x93, 0x83, 0xf1, 0x3a, 0x31, 0x68, 0xcb, 0x2e, 0x76, 0xcb, 0xd1, 0x58, 0x15, 0x5a,
-	0x26, 0xde, 0x27, 0x06, 0xbd, 0x58, 0x16, 0x56, 0x88, 0x72, 0x40, 0xde, 0x20, 0x06, 0xdd, 0x9a,
-	0x0b, 0x4f, 0xeb, 0x44, 0x39, 0x24, 0xff, 0x4f, 0x0c, 0x8a, 0xca, 0x42, 0xcb, 0x44, 0xb7, 0x60,
-	0xbb, 0x10, 0xaa, 0xc9, 0x76, 0x93, 0x18, 0x74, 0xc5, 0x2e, 0x00, 0x6a, 0x54, 0xd6, 0xa4, 0x96,
-	0x89, 0xbf, 0x21, 0x06, 0x5d, 0xae, 0x48, 0x2d, 0x13, 0xdd, 0x81, 0x5b, 0x73, 0xf7, 0x0a, 0x7b,
-	0x40, 0x0c, 0xba, 0x69, 0x17, 0x8c, 0x62, 0x64, 0xd6, 0xc5, 0x96, 0x89, 0x29, 0x31, 0x68, 0xbb,
-	0x2a, 0x16, 0x63, 0x7d, 0x1e, 0x04, 0x1f, 0x9c, 0xb7, 0x88, 0x41, 0x1b, 0xf3, 0xd2, 0x8b, 0xd1,
-	0xa9, 0xe7, 0x2f, 0x87, 0xe7, 0x6d, 0x62, 0x50, 0x30, 0xcf, 0x5f, 0x8e, 0xcf, 0x1b, 0xb0, 0xd8,
-	0x29, 0x06, 0xe8, 0x1d, 0x62, 0xd0, 0x55, 0xbb, 0xa9, 0x8c, 0x7c, 0x84, 0x96, 0xaa, 0x29, 0x86,
-	0xe8, 0x5d, 0x62, 0xd0, 0x35, 0xad, 0x9a, 0x62, 0x8c, 0xea, 0xd1, 0x89, 0x41, 0x7a, 0x8f, 0x18,
-	0xb4, 0x39, 0x8f, 0x4e, 0x8c, 0xd2, 0x08, 0x5e, 0x2e, 0x64, 0x95, 0x1e, 0xea, 0x13, 0xe3, 0x7c,
-	0x3d, 0x64, 0xef, 0x2a, 0x74, 0xb9, 0x87, 0x5c, 0xb8, 0x53, 0xf5, 0xc9, 0xbb, 0xc8, 0x24, 0xc6,
-	0x39, 0xba, 0xc8, 0x46, 0x65, 0x6f, 0xbc, 0x8b, 0x2c, 0xb8, 0x5b, 0x29, 0xd7, 0x30, 0x74, 0xd9,
-	0x98, 0xe1, 0x6f, 0xf3, 0xa2, 0x0d, 0x1a, 0xab, 0x0d, 0x7b, 0xbb, 0x5c, 0xb8, 0x17, 0xf9, 0x32,
-	0x3a, 0xd0, 0xce, 0x62, 0x1c, 0x44, 0x13, 0x6c, 0x49, 0x3d, 0x98, 0x9f, 0xc7, 0x4f, 0x41, 0x34,
-	0x41, 0x91, 0xe6, 0xc0, 0x73, 0x3e, 0x66, 0x45, 0xf5, 0x1e, 0x9c, 0xb7, 0x7a, 0x83, 0x06, 0x05,
-	0xf3, 0xe0, 0x7e, 0x75, 0x3e, 0x66, 0xaa, 0x7e, 0x33, 0xb8, 0x35, 0x73, 0x42, 0x95, 0x8f, 0xbc,
-	0x05, 0x3f, 0x70, 0x7f, 0x47, 0x5f, 0xe4, 0xef, 0x99, 0x13, 0x8a, 0xa4, 0xc5, 0xdf, 0x27, 0x7e,
-	0x12, 0x65, 0xf6, 0xe6, 0xac, 0x6c, 0x45, 0xef, 0xe1, 0x6e, 0xee, 0x4e, 0x4c, 0x3c, 0x79, 0x5e,
-	0xf9, 0x37, 0x08, 0xfe, 0x91, 0xbb, 0x7c, 0xfc, 0xa5, 0x2e, 0xf9, 0x1b, 0x49, 0xa4, 0x9a, 0xdb,
-	0x84, 0x57, 0x34, 0xab, 0x2d, 0x74, 0xf6, 0x60, 0xab, 0x7c, 0x71, 0x36, 0x60, 0x63, 0x34, 0x92,
-	0x1f, 0x06, 0x8d, 0xd1, 0xa8, 0x33, 0x80, 0x3b, 0x9f, 0x4a, 0x01, 0xb5, 0xa1, 0xf1, 0x96, 0x65,
-	0x5c, 0xb8, 0x66, 0xe7, 0x3f, 0xd1, 0x0e, 0x5c, 0x12, 0xff, 0x2c, 0x35, 0xb8, 0x4d, 0x3c, 0x3c,
-	0x6a, 0x3c, 0x04, 0x9d, 0x0c, 0x5e, 0x5e, 0x10, 0x93, 0x8e, 0x31, 0x04, 0xe6, 0xa9, 0x8e, 0x59,
-	0xef, 0xf5, 0xfe, 0x2b, 0x75, 0x49, 0xd4, 0x0a, 0xa0, 0xb9, 0xde, 0x3f, 0x80, 0x50, 0xbb, 0xaa,
-	0x2b, 0xd0, 0x38, 0x7e, 0xfe, 0xbc, 0x7d, 0x21, 0xff, 0x31, 0x38, 0xb2, 0xdb, 0x40, 0xfc, 0x78,
-	0xdd, 0x6e, 0x0c, 0x5a, 0x70, 0x5d, 0xab, 0xfb, 0xfe, 0xdf, 0x00, 0xa2, 0x3a, 0x39, 0x0f, 0x6e,
-	0xfc, 0xc6, 0xf5, 0x26, 0x3c, 0xe0, 0xaf, 0x0c, 0x8e, 0x03, 0xd0, 0x31, 0x5c, 0x09, 0x9d, 0xcc,
-	0x0b, 0x9c, 0x89, 0x4c, 0xf4, 0xee, 0x97, 0x9c, 0xb1, 0xad, 0x36, 0xdf, 0x3e, 0x80, 0xf0, 0xc4,
-	0x0b, 0x46, 0x8e, 0xa7, 0x12, 0x3c, 0x51, 0x09, 0x9e, 0xa8, 0x04, 0x4f, 0x78, 0x82, 0x8f, 0x5e,
-	0x3f, 0x9c, 0xba, 0xc9, 0x9b, 0x74, 0xd4, 0x1d, 0x07, 0xb3, 0x43, 0xf9, 0xe5, 0x38, 0x66, 0xde,
-	0xbd, 0x38, 0x64, 0xe3, 0xcf, 0x7f, 0x08, 0x8f, 0x96, 0x85, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x71, 0x6b, 0xa6, 0xb1, 0x36, 0x0f, 0x00, 0x00,
+	// 1328 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x97, 0x5b, 0x73, 0xd3, 0x46,
+	0x14, 0xc7, 0x59, 0x8b, 0xdc, 0x36, 0x71, 0xe2, 0x6c, 0x12, 0xb2, 0xb8, 0x0c, 0x59, 0x42, 0x69,
+	0x96, 0x9b, 0x33, 0xd8, 0xaa, 0xa0, 0x4c, 0xdb, 0x99, 0xb8, 0x90, 0xd0, 0x4e, 0x29, 0x8c, 0x02,
+	0xed, 0x0c, 0x2f, 0xae, 0x6c, 0x6f, 0x8c, 0x8a, 0x2c, 0xa9, 0xba, 0x00, 0xe2, 0xbd, 0x5f, 0xa5,
+	0x9f, 0xb3, 0xa3, 0xbd, 0xc8, 0x2b, 0x09, 0xd3, 0x81, 0xbc, 0x78, 0xac, 0xb3, 0xff, 0xfd, 0x9d,
+	0xcb, 0xee, 0xd1, 0xae, 0xe0, 0xcd, 0x30, 0x0a, 0x92, 0xe0, 0x30, 0x61, 0x71, 0x72, 0xf8, 0xf6,
+	0xde, 0x21, 0x7f, 0xea, 0xf1, 0xc7, 0x81, 0xe3, 0x79, 0x83, 0x24, 0x0b, 0x59, 0xdc, 0xe1, 0x56,
+	0x74, 0x75, 0x12, 0x04, 0x13, 0x8f, 0x75, 0x9c, 0xd0, 0xed, 0xb0, 0xf7, 0x61, 0xd4, 0xc9, 0x55,
+	0x9d, 0xb7, 0xf7, 0xc4, 0x70, 0xaf, 0x7d, 0x59, 0x8c, 0x0b, 0xc6, 0x30, 0x3d, 0x3b, 0x74, 0xfc,
+	0x4c, 0x8c, 0xb5, 0xaf, 0x56, 0x87, 0xc6, 0x69, 0xe4, 0x24, 0x6e, 0xe0, 0xcb, 0xf1, 0x2b, 0xd5,
+	0xf1, 0x38, 0x89, 0xd2, 0x51, 0x22, 0x47, 0xf7, 0xaa, 0xa3, 0x89, 0x3b, 0x65, 0x71, 0xe2, 0x4c,
+	0xc3, 0x79, 0xf8, 0x77, 0x91, 0x13, 0x86, 0x2c, 0x92, 0x91, 0xef, 0xff, 0x73, 0x05, 0xae, 0xbd,
+	0x60, 0x71, 0x72, 0xe4, 0x79, 0x2f, 0xf2, 0x84, 0xd0, 0x35, 0xb8, 0x16, 0xbb, 0xfe, 0xc4, 0x63,
+	0x03, 0xd7, 0x4f, 0x7a, 0x5d, 0x0c, 0x08, 0xa0, 0x0b, 0xf6, 0xaa, 0xb0, 0xfd, 0x9c, 0x9b, 0xca,
+	0x12, 0xcb, 0xc4, 0x0d, 0x02, 0xa8, 0xa1, 0x49, 0x2c, 0x13, 0x5d, 0x87, 0x4d, 0x29, 0x49, 0x05,
+	0xc6, 0x20, 0x80, 0x36, 0x6d, 0x39, 0xef, 0x25, 0xb7, 0x55, 0x44, 0x96, 0x89, 0x2f, 0x12, 0x40,
+	0x2f, 0xea, 0xa2, 0x12, 0x29, 0x16, 0xa4, 0x05, 0x02, 0xe8, 0xa6, 0x12, 0x9d, 0x56, 0x49, 0xb1,
+	0x20, 0x2d, 0x12, 0x40, 0x91, 0x2e, 0xb2, 0x4c, 0x74, 0x03, 0xae, 0x4b, 0xd1, 0x99, 0xfb, 0x9e,
+	0x8d, 0x7b, 0x5d, 0xbc, 0x44, 0x00, 0x5d, 0xb2, 0xe5, 0xd4, 0x63, 0x61, 0xac, 0xca, 0x2c, 0x13,
+	0x2f, 0x13, 0x40, 0x17, 0x4b, 0x32, 0xcb, 0x44, 0x07, 0x70, 0x43, 0xb9, 0x54, 0xb8, 0x15, 0x02,
+	0xe8, 0x86, 0x2d, 0x67, 0x9f, 0x4a, 0x6b, 0x4d, 0x68, 0x99, 0x18, 0x12, 0x40, 0x5b, 0x65, 0xa1,
+	0x65, 0x6a, 0x65, 0x3d, 0xf3, 0x02, 0x27, 0xc1, 0xab, 0x04, 0xd0, 0x86, 0x2a, 0xeb, 0x71, 0x6e,
+	0xd2, 0xf2, 0x1c, 0x07, 0xe9, 0xd0, 0x63, 0x78, 0x8d, 0x00, 0x0a, 0x54, 0x9e, 0x8f, 0xb8, 0x0d,
+	0xed, 0x41, 0x39, 0x67, 0x30, 0x0c, 0x02, 0x0f, 0x37, 0x09, 0xa0, 0xcb, 0x36, 0x14, 0xa6, 0x7e,
+	0x10, 0x78, 0x7a, 0xb5, 0x92, 0xc8, 0xf5, 0x27, 0x78, 0x9d, 0x00, 0xba, 0x52, 0x54, 0x8b, 0xdb,
+	0xb4, 0x68, 0x86, 0x59, 0xc2, 0x62, 0xbc, 0x41, 0x00, 0x5d, 0x53, 0xd1, 0xf4, 0x73, 0x13, 0xea,
+	0x41, 0x49, 0x1d, 0x38, 0x7e, 0x86, 0xc7, 0x04, 0xd0, 0xd5, 0xee, 0x76, 0x47, 0xb6, 0x82, 0xda,
+	0x70, 0x9d, 0x23, 0x3f, 0xb3, 0x57, 0x84, 0xee, 0xc8, 0xcf, 0x50, 0xbf, 0x28, 0x87, 0xda, 0xe8,
+	0x98, 0xf1, 0x99, 0x97, 0x6b, 0x33, 0x1f, 0x49, 0x81, 0xaa, 0x94, 0x7a, 0x46, 0x8f, 0x61, 0x4b,
+	0x32, 0x8a, 0xed, 0x8e, 0xcf, 0x38, 0xa4, 0x5d, 0x83, 0xbc, 0x50, 0x0a, 0x5b, 0xfa, 0x2d, 0x0c,
+	0xe8, 0x7b, 0xbd, 0x0e, 0xe9, 0x28, 0xc1, 0x13, 0xce, 0xd8, 0xad, 0x31, 0x4e, 0xf9, 0xb0, 0x56,
+	0xa0, 0x74, 0x94, 0xa0, 0xef, 0x8a, 0x02, 0xbd, 0x75, 0xbc, 0x94, 0xe1, 0xd7, 0x7c, 0xf2, 0xa5,
+	0xda, 0xe4, 0xdf, 0xf3, 0x51, 0x55, 0x38, 0xfe, 0x80, 0x9e, 0xc2, 0x6d, 0xbd, 0x81, 0x06, 0xb2,
+	0x27, 0xb1, 0xcb, 0x11, 0x5f, 0xd5, 0x10, 0xbc, 0xa7, 0x04, 0x07, 0x69, 0x5d, 0xf6, 0x87, 0x98,
+	0x56, 0xc6, 0xf5, 0xba, 0x05, 0xee, 0xaf, 0xf9, 0xb8, 0x5e, 0xb7, 0x8a, 0xeb, 0x75, 0x15, 0xee,
+	0x39, 0xdc, 0x29, 0x6d, 0xb2, 0x82, 0xf7, 0x86, 0xf3, 0xae, 0xd4, 0xd7, 0x89, 0xcb, 0x04, 0x70,
+	0x4b, 0xdf, 0x8a, 0xf5, 0x00, 0xf9, 0xce, 0x2e, 0x80, 0xde, 0x9c, 0x00, 0xf9, 0x66, 0x2f, 0x05,
+	0xc8, 0x2d, 0xf5, 0x00, 0xd3, 0x72, 0xfd, 0xa6, 0x73, 0x02, 0x7c, 0xa9, 0x15, 0x70, 0x4b, 0x7f,
+	0xbb, 0x7c, 0x9c, 0xa8, 0x95, 0xd0, 0xff, 0x04, 0x51, 0xd5, 0x70, 0x4b, 0x7f, 0xa9, 0xd5, 0x89,
+	0xa2, 0xc7, 0x0a, 0x62, 0x30, 0x87, 0x28, 0xda, 0xae, 0x44, 0x14, 0x26, 0x45, 0xfc, 0x05, 0x6e,
+	0x69, 0x6d, 0x5d, 0xf0, 0xc2, 0x39, 0xfb, 0x3e, 0xef, 0x74, 0x41, 0xdb, 0x9c, 0xb5, 0x7e, 0x7d,
+	0x41, 0x78, 0x73, 0x17, 0xb0, 0xbf, 0xe7, 0x2c, 0x08, 0xef, 0xf7, 0xd2, 0x82, 0x70, 0x8b, 0xc2,
+	0x85, 0x45, 0xb2, 0x3e, 0x8b, 0x13, 0x36, 0x1e, 0x4c, 0x59, 0x1c, 0x3b, 0x13, 0x86, 0x77, 0x38,
+	0xef, 0x61, 0xe7, 0xd3, 0xc7, 0x63, 0x47, 0x3f, 0x80, 0x3a, 0xbf, 0x71, 0xc4, 0x53, 0x41, 0x78,
+	0x72, 0x41, 0x15, 0xa3, 0x64, 0x46, 0x13, 0x88, 0xca, 0x1e, 0x99, 0x9f, 0x4e, 0xf1, 0x25, 0x02,
+	0xe8, 0x7a, 0xf7, 0xfe, 0x17, 0xb8, 0x7b, 0xec, 0xa7, 0xd3, 0x27, 0x17, 0xec, 0x96, 0xee, 0x2b,
+	0xb7, 0x21, 0x17, 0xa2, 0x38, 0x71, 0xfc, 0xb1, 0xe3, 0x05, 0x3e, 0x2b, 0xf2, 0xda, 0x3d, 0x6f,
+	0x5e, 0xf6, 0xe6, 0x8c, 0xaa, 0x72, 0xfa, 0x13, 0x6e, 0x68, 0xae, 0x78, 0x42, 0xf8, 0x5c, 0x09,
+	0xd9, 0xeb, 0x33, 0x1e, 0x4f, 0xe6, 0x06, 0x5c, 0x8f, 0x58, 0xc8, 0x9c, 0xbc, 0x60, 0xe2, 0x30,
+	0xdd, 0x23, 0x06, 0x5d, 0xb0, 0x9b, 0xca, 0x2a, 0xce, 0xf7, 0x8a, 0xcc, 0x32, 0x31, 0x21, 0x06,
+	0x35, 0x4a, 0x32, 0x71, 0x02, 0x16, 0x32, 0x79, 0xca, 0x5f, 0x23, 0x06, 0x6d, 0xda, 0xc5, 0x6c,
+	0x79, 0xce, 0x57, 0x85, 0x96, 0x89, 0xf7, 0x89, 0x41, 0x2f, 0x96, 0x85, 0x15, 0xa2, 0x3c, 0xed,
+	0xaf, 0x13, 0x83, 0x6e, 0xce, 0x84, 0xa7, 0x75, 0xa2, 0x3c, 0xf1, 0xbf, 0x26, 0x06, 0x45, 0x65,
+	0xa1, 0x65, 0xa2, 0x9b, 0xb0, 0x55, 0x08, 0xd5, 0x31, 0x7d, 0x83, 0x18, 0x74, 0xc9, 0x2e, 0x00,
+	0xea, 0xdc, 0xaf, 0x49, 0x2d, 0x13, 0x7f, 0x43, 0x0c, 0xba, 0x58, 0x91, 0x5a, 0x26, 0xba, 0x0d,
+	0x37, 0x67, 0xee, 0x15, 0xf6, 0x80, 0x18, 0x74, 0xc3, 0x2e, 0x18, 0xc5, 0xf9, 0x5f, 0x17, 0x5b,
+	0x26, 0xa6, 0xc4, 0xa0, 0xad, 0xaa, 0x58, 0xdc, 0x51, 0x66, 0x41, 0xf0, 0x5b, 0xc0, 0x4d, 0x62,
+	0xd0, 0xc6, 0xac, 0xf4, 0xe2, 0x1e, 0xa0, 0xe7, 0x2f, 0x6f, 0x02, 0xb7, 0x88, 0x41, 0xc1, 0x2c,
+	0x7f, 0x79, 0x17, 0xb8, 0x0e, 0x8b, 0x99, 0xe2, 0x36, 0x70, 0x9b, 0x18, 0x74, 0xd9, 0x5e, 0x53,
+	0x46, 0x7e, 0x1f, 0x28, 0x55, 0x53, 0xdc, 0x08, 0xee, 0x10, 0x83, 0xae, 0x68, 0xd5, 0x14, 0x77,
+	0x02, 0x3d, 0x3a, 0x71, 0x2b, 0xb8, 0x4b, 0x0c, 0xba, 0x36, 0x8b, 0x4e, 0xdc, 0x0b, 0x22, 0xb8,
+	0x5b, 0xc8, 0x2a, 0x2f, 0x84, 0x1e, 0x31, 0xce, 0xd9, 0x38, 0x3b, 0x0a, 0x5d, 0x7e, 0x21, 0xb8,
+	0x70, 0xbb, 0xea, 0x93, 0x77, 0x90, 0x49, 0x8c, 0xf3, 0x74, 0x10, 0x2a, 0x7b, 0xe3, 0x5d, 0x64,
+	0xc1, 0x9d, 0x4a, 0xb9, 0x06, 0xa1, 0xcb, 0x46, 0x0c, 0x7f, 0x9b, 0x17, 0xad, 0xdf, 0x58, 0x6e,
+	0xd8, 0x5b, 0xe5, 0xc2, 0x3d, 0xcf, 0x87, 0xd1, 0x81, 0xb6, 0x16, 0xa3, 0x20, 0x1a, 0x63, 0x4b,
+	0xea, 0xc1, 0x6c, 0x3d, 0x7e, 0x0a, 0xa2, 0x31, 0x8a, 0x34, 0x07, 0x9e, 0xf3, 0x21, 0x2b, 0xaa,
+	0x77, 0xff, 0xbc, 0xd5, 0xeb, 0x37, 0x28, 0x98, 0x05, 0xf7, 0xab, 0xf3, 0x21, 0x53, 0xf5, 0x9b,
+	0xc2, 0xcd, 0xa9, 0x13, 0xaa, 0x7c, 0xe4, 0x2e, 0xf8, 0x81, 0xfb, 0x3b, 0xfa, 0x2c, 0x7f, 0x4f,
+	0x9d, 0x50, 0x24, 0x2d, 0x7e, 0x1f, 0xfb, 0x49, 0x94, 0xd9, 0x1b, 0xd3, 0xb2, 0x15, 0xbd, 0x83,
+	0x3b, 0xb9, 0x3b, 0x71, 0x7c, 0xcb, 0xf5, 0xca, 0x3f, 0xa8, 0xf0, 0x8f, 0xdc, 0xe5, 0xa3, 0xcf,
+	0x75, 0xc9, 0xdf, 0x48, 0x22, 0xd5, 0xdc, 0x26, 0xbc, 0xa2, 0x69, 0x6d, 0xa0, 0xbd, 0x07, 0x9b,
+	0xe5, 0x8d, 0xb3, 0x0e, 0x1b, 0xc3, 0xa1, 0xfc, 0xca, 0x69, 0x0c, 0x87, 0xed, 0x3e, 0xdc, 0xfe,
+	0x58, 0x0a, 0xa8, 0x05, 0x8d, 0x37, 0x2c, 0xe3, 0xc2, 0x15, 0x3b, 0xff, 0x8b, 0xb6, 0xe1, 0x82,
+	0xb8, 0xf9, 0x35, 0xb8, 0x4d, 0x3c, 0x3c, 0x6c, 0x3c, 0x00, 0xed, 0x0c, 0xee, 0xce, 0x89, 0x49,
+	0xc7, 0x18, 0x02, 0xf3, 0x44, 0xc7, 0xac, 0x76, 0xbb, 0xff, 0x97, 0xba, 0x24, 0x6a, 0x05, 0xd0,
+	0x5c, 0xef, 0x1f, 0x40, 0xa8, 0x6d, 0xd5, 0x25, 0x68, 0x1c, 0x3f, 0x7b, 0xd6, 0xba, 0x90, 0xff,
+	0xe9, 0x1f, 0xd9, 0x2d, 0x20, 0xfe, 0xbc, 0x6a, 0x35, 0xfa, 0x4d, 0xb8, 0xaa, 0xd5, 0x7d, 0xff,
+	0x5f, 0x00, 0x51, 0x9d, 0x9c, 0x07, 0x37, 0x7a, 0xed, 0x7a, 0x63, 0x1e, 0xf0, 0x17, 0x06, 0xc7,
+	0x01, 0xe8, 0x18, 0x2e, 0x85, 0x4e, 0xe6, 0x05, 0xce, 0x58, 0x26, 0x7a, 0xe7, 0x73, 0xd6, 0xd8,
+	0x56, 0x93, 0x6f, 0x1d, 0x40, 0x78, 0xe2, 0x05, 0x43, 0xc7, 0x53, 0x09, 0x9e, 0xa8, 0x04, 0x4f,
+	0x54, 0x82, 0x27, 0x3c, 0xc1, 0x87, 0xaf, 0x1e, 0x4c, 0xdc, 0xe4, 0x75, 0x3a, 0xec, 0x8c, 0x82,
+	0xe9, 0xa1, 0xfc, 0x0c, 0x1e, 0x31, 0xef, 0x6e, 0x1c, 0xb2, 0xd1, 0xa7, 0xbf, 0xea, 0x87, 0x8b,
+	0xc2, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x30, 0xc9, 0x2e, 0x6c, 0x03, 0x10, 0x00, 0x00,
 }
diff --git a/tests/simple/testdata/proto2.textproto b/tests/simple/testdata/proto2.textproto
index b56936e5..bfc03257 100644
--- a/tests/simple/testdata/proto2.textproto
+++ b/tests/simple/testdata/proto2.textproto
@@ -528,3 +528,160 @@ section {
     value: { map_value: {} }
   }
 }
+section {
+  name: "has"
+  description: "Tests for the has() macro on proto2 messages."
+  test {
+    name: "undefined"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.no_such_field)"
+    disable_check: true
+    eval_error: {
+      errors: { message: "no_such_field" }
+    }
+  }
+  test {
+    name: "repeated_none_implicit"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.repeated_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "repeated_none_explicit"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{repeated_int32: []}.repeated_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "repeated_one"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{repeated_int32: [1]}.repeated_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "repeated_many"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{repeated_int32: [1, 2, 3]}.repeated_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_none_implicit"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.map_string_string)"
+    value { bool_value: false }
+  }
+  test {
+    name: "map_none_explicit"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{map_string_string: {}}.map_string_string)"
+    value { bool_value: false }
+  }
+  test {
+    name: "map_one_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{map_string_string: {'MT': ''}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_one"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{map_string_string: {'one': 'uno'}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_many"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{map_string_string: {'one': 'uno', 'two': 'dos'}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "required"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestRequired{required_int32: 4}.required_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_unset_no_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.single_sint32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "optional_set_no_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_sint32: -4}.single_sint32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_unset_with_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.single_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "optional_set_with_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_int32: 16}.single_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_set_to_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_int32: -32}.single_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_message_unset"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.standalone_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "optional_message_set"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{standalone_message: TestAllTypes.NestedMessage{}}.standalone_message)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_enum_unset"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.standalone_enum)"
+    value { bool_value: false }
+  }
+  test {
+    name: "optional_enum_set"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{standalone_enum: TestAllTypes.NestedEnum.BAR}.standalone_enum)"
+    value { bool_value: true }
+  }
+  test {
+    name: "optional_enum_set_zero"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{standalone_enum: TestAllTypes.NestedEnum.FOO}.standalone_enum)"
+    value { bool_value: true }
+  }
+  test {
+    name: "oneof_unset"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{}.single_nested_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "oneof_other_set"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_nested_enum: TestAllTypes.NestedEnum.BAZ}.single_nested_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "oneof_set"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_nested_message: TestAllTypes.NestedMessage{}}.single_nested_message)"
+    value { bool_value: true }
+  }
+  test {
+    name: "oneof_set_default"
+    container: "google.api.expr.test.v1.proto2"
+    expr: "has(TestAllTypes{single_nested_enum: TestAllTypes.NestedEnum.FOO}.single_nested_enum)"
+    value { bool_value: true }
+  }
+}
diff --git a/tests/simple/testdata/proto3.textproto b/tests/simple/testdata/proto3.textproto
index bf2683c0..363b3ec8 100644
--- a/tests/simple/testdata/proto3.textproto
+++ b/tests/simple/testdata/proto3.textproto
@@ -521,3 +521,148 @@ section {
     value: { map_value: {} }
   }
 }
+section {
+  name: "has"
+  description: "Tests for the has() macro on proto3 messages."
+  test {
+    name: "undefined"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.no_such_field)"
+    disable_check: true
+    eval_error: {
+      errors: { message: "no_such_field" }
+    }
+  }
+  test {
+    name: "repeated_none_implicit"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.repeated_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "repeated_none_explicit"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{repeated_int32: []}.repeated_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "repeated_one"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{repeated_int32: [1]}.repeated_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "repeated_many"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{repeated_int32: [1, 2, 3]}.repeated_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_none_implicit"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.map_string_string)"
+    value { bool_value: false }
+  }
+  test {
+    name: "map_none_explicit"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{map_string_string: {}}.map_string_string)"
+    value { bool_value: false }
+  }
+  test {
+    name: "map_one_default"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{map_string_string: {'MT': ''}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_one"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{map_string_string: {'one': 'uno'}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "map_many"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{map_string_string: {'one': 'uno', 'two': 'dos'}}.map_string_string)"
+    value { bool_value: true }
+  }
+  test {
+    name: "single_unset"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.single_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "single_set"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{single_int32: 16}.single_int32)"
+    value { bool_value: true }
+  }
+  test {
+    name: "single_set_to_default"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{single_int32: 0}.single_int32)"
+    value { bool_value: false }
+  }
+  test {
+    name: "single_message_unset"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.standalone_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "single_message_set"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{standalone_message: TestAllTypes.NestedMessage{bb: 123}}.standalone_message)"
+    value { bool_value: true }
+  }
+  test {
+    name: "single_message_set_to_default"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{standalone_message: TestAllTypes.NestedMessage{}}.standalone_message)"
+    value { bool_value: true }
+  }
+  test {
+    name: "single_enum_unset"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.standalone_enum)"
+    value { bool_value: false }
+  }
+  test {
+    name: "single_enum_set"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{standalone_enum: TestAllTypes.NestedEnum.BAR}.standalone_enum)"
+    value { bool_value: true }
+  }
+  test {
+    name: "single_enum_set_zero"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{standalone_enum: TestAllTypes.NestedEnum.FOO}.standalone_enum)"
+    value { bool_value: false }
+  }
+  test {
+    name: "oneof_unset"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{}.single_nested_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "oneof_other_set"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{single_nested_enum: TestAllTypes.NestedEnum.BAZ}.single_nested_message)"
+    value { bool_value: false }
+  }
+  test {
+    name: "oneof_set"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{single_nested_message: TestAllTypes.NestedMessage{}}.single_nested_message)"
+    value { bool_value: true }
+  }
+  test {
+    name: "oneof_set_default"
+    container: "google.api.expr.test.v1.proto3"
+    expr: "has(TestAllTypes{single_nested_enum: TestAllTypes.NestedEnum.FOO}.single_nested_enum)"
+    value { bool_value: true }
+  }
+}