diff --git a/api/netflix/titus/agent.pb.go b/api/netflix/titus/agent.pb.go
index c497ea688..bcd9dd46a 100644
--- a/api/netflix/titus/agent.pb.go
+++ b/api/netflix/titus/agent.pb.go
@@ -454,7 +454,6 @@ type ContainerInfo struct {
 	HealthCheckCmd      []string                             `protobuf:"bytes,9,rep,name=healthCheckCmd" json:"healthCheckCmd,omitempty"`
 	SnapshotPolicy      *ContainerInfo_SnapshotPolicy        `protobuf:"varint,10,opt,name=snapshotPolicy,enum=messages.ContainerInfo_SnapshotPolicy" json:"snapshotPolicy,omitempty"`
 	EntrypointCmd       []string                             `protobuf:"bytes,11,rep,name=entrypointCmd" json:"entrypointCmd,omitempty"`
-	AllocateIpAddress   *bool                                `protobuf:"varint,12,opt,name=allocateIpAddress,def=0" json:"allocateIpAddress,omitempty"`
 	EntrypointStr       *string                              `protobuf:"bytes,13,opt,name=entrypointStr" json:"entrypointStr,omitempty"`
 	AppName             *string                              `protobuf:"bytes,14,opt,name=appName" json:"appName,omitempty"`
 	JobGroupStack       *string                              `protobuf:"bytes,15,opt,name=jobGroupStack" json:"jobGroupStack,omitempty"`
@@ -462,12 +461,13 @@ type ContainerInfo struct {
 	IamProfile          *string                              `protobuf:"bytes,17,opt,name=iamProfile" json:"iamProfile,omitempty"`
 	NetworkConfigInfo   *ContainerInfo_NetworkConfigInfo     `protobuf:"bytes,18,opt,name=networkConfigInfo" json:"networkConfigInfo,omitempty"`
 	JobGroupSequence    *string                              `protobuf:"bytes,19,opt,name=jobGroupSequence" json:"jobGroupSequence,omitempty"`
-	NumGpus             *uint32                              `protobuf:"varint,20,opt,name=numGpus" json:"numGpus,omitempty"`
-	EfsConfigInfo       []*ContainerInfo_EfsConfigInfo       `protobuf:"bytes,21,rep,name=efsConfigInfo" json:"efsConfigInfo,omitempty"`
-	Capabilities        *ContainerInfo_Capabilities          `protobuf:"bytes,22,opt,name=capabilities" json:"capabilities,omitempty"`
-	MetatronCreds       *ContainerInfo_MetatronCreds         `protobuf:"bytes,23,opt,name=metatronCreds" json:"metatronCreds,omitempty"`
-	UserProvidedEnv     map[string]string                    `protobuf:"bytes,24,rep,name=userProvidedEnv" json:"userProvidedEnv,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	TitusProvidedEnv    map[string]string                    `protobuf:"bytes,25,rep,name=titusProvidedEnv" json:"titusProvidedEnv,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	// TODO(Sargun): Remove, and use the Mesos resource info instead
+	NumGpus          *uint32                        `protobuf:"varint,20,opt,name=numGpus" json:"numGpus,omitempty"`
+	EfsConfigInfo    []*ContainerInfo_EfsConfigInfo `protobuf:"bytes,21,rep,name=efsConfigInfo" json:"efsConfigInfo,omitempty"`
+	Capabilities     *ContainerInfo_Capabilities    `protobuf:"bytes,22,opt,name=capabilities" json:"capabilities,omitempty"`
+	MetatronCreds    *ContainerInfo_MetatronCreds   `protobuf:"bytes,23,opt,name=metatronCreds" json:"metatronCreds,omitempty"`
+	UserProvidedEnv  map[string]string              `protobuf:"bytes,24,rep,name=userProvidedEnv" json:"userProvidedEnv,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	TitusProvidedEnv map[string]string              `protobuf:"bytes,25,rep,name=titusProvidedEnv" json:"titusProvidedEnv,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
 	// imageDigest has precedence over version
 	ImageDigest          *string `protobuf:"bytes,26,opt,name=imageDigest" json:"imageDigest,omitempty"`
 	AllowNetworkBursting *bool   `protobuf:"varint,27,opt,name=allowNetworkBursting" json:"allowNetworkBursting,omitempty"`
@@ -499,7 +499,6 @@ func (*ContainerInfo) ProtoMessage()               {}
 func (*ContainerInfo) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} }
 
 const Default_ContainerInfo_Version string = "latest"
-const Default_ContainerInfo_AllocateIpAddress bool = false
 
 func (m *ContainerInfo) GetImageName() string {
 	if m != nil && m.ImageName != nil {
@@ -578,13 +577,6 @@ func (m *ContainerInfo) GetEntrypointCmd() []string {
 	return nil
 }
 
-func (m *ContainerInfo) GetAllocateIpAddress() bool {
-	if m != nil && m.AllocateIpAddress != nil {
-		return *m.AllocateIpAddress
-	}
-	return Default_ContainerInfo_AllocateIpAddress
-}
-
 func (m *ContainerInfo) GetEntrypointStr() string {
 	if m != nil && m.EntrypointStr != nil {
 		return *m.EntrypointStr
@@ -768,11 +760,9 @@ func (m *ContainerInfo_EnvironmentVariable) GetValue() string {
 }
 
 type ContainerInfo_NetworkConfigInfo struct {
-	// deprecated: use eniLabel instead
-	EniLablel *string `protobuf:"bytes,1,req,name=eniLablel" json:"eniLablel,omitempty"`
-	// this should be required, but it was added later (typo fix) and is optional for backwards compatibility
+	// should this be required?
+	// it was added later (typo fix)
 	EniLabel           *string  `protobuf:"bytes,5,opt,name=eniLabel" json:"eniLabel,omitempty"`
-	AllocateIpAddress  *bool    `protobuf:"varint,2,opt,name=allocateIpAddress,def=0" json:"allocateIpAddress,omitempty"`
 	SecurityGroups     []string `protobuf:"bytes,3,rep,name=securityGroups" json:"securityGroups,omitempty"`
 	BandwidthLimitMbps *uint32  `protobuf:"varint,4,opt,name=bandwidthLimitMbps" json:"bandwidthLimitMbps,omitempty"`
 	XXX_unrecognized   []byte   `json:"-"`
@@ -785,15 +775,6 @@ func (*ContainerInfo_NetworkConfigInfo) Descriptor() ([]byte, []int) {
 	return fileDescriptor2, []int{4, 1}
 }
 
-const Default_ContainerInfo_NetworkConfigInfo_AllocateIpAddress bool = false
-
-func (m *ContainerInfo_NetworkConfigInfo) GetEniLablel() string {
-	if m != nil && m.EniLablel != nil {
-		return *m.EniLablel
-	}
-	return ""
-}
-
 func (m *ContainerInfo_NetworkConfigInfo) GetEniLabel() string {
 	if m != nil && m.EniLabel != nil {
 		return *m.EniLabel
@@ -801,13 +782,6 @@ func (m *ContainerInfo_NetworkConfigInfo) GetEniLabel() string {
 	return ""
 }
 
-func (m *ContainerInfo_NetworkConfigInfo) GetAllocateIpAddress() bool {
-	if m != nil && m.AllocateIpAddress != nil {
-		return *m.AllocateIpAddress
-	}
-	return Default_ContainerInfo_NetworkConfigInfo_AllocateIpAddress
-}
-
 func (m *ContainerInfo_NetworkConfigInfo) GetSecurityGroups() []string {
 	if m != nil {
 		return m.SecurityGroups
@@ -961,117 +935,115 @@ func init() {
 func init() { proto.RegisterFile("netflix/titus/agent.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 1785 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x57, 0xdd, 0x76, 0xe2, 0xc8,
-	0x11, 0x1e, 0xc0, 0x7f, 0x14, 0x06, 0xb7, 0xdb, 0x9e, 0x59, 0x0d, 0x3b, 0x3b, 0xcb, 0x92, 0xd9,
-	0x39, 0x4e, 0xb2, 0xf1, 0x4c, 0xbc, 0x39, 0x27, 0x39, 0x73, 0xb3, 0x47, 0x16, 0x1a, 0x5b, 0xc7,
-	0x20, 0x91, 0x16, 0x98, 0x75, 0x6e, 0x38, 0x6d, 0xd4, 0x60, 0xad, 0x85, 0x44, 0xa4, 0xc6, 0x33,
-	0x7e, 0x8d, 0x3c, 0x48, 0x9e, 0x25, 0x4f, 0x90, 0xfb, 0x5c, 0xe7, 0x05, 0x72, 0xaa, 0x25, 0xfe,
-	0x6c, 0x9c, 0x6c, 0x92, 0x2b, 0x54, 0x5f, 0x55, 0x57, 0x75, 0x7d, 0x5d, 0x5d, 0xd5, 0xc0, 0xcb,
-	0x50, 0xc8, 0x61, 0xe0, 0x7f, 0x7e, 0x27, 0x7d, 0x39, 0x4d, 0xde, 0xf1, 0x91, 0x08, 0xe5, 0xf1,
-	0x24, 0x8e, 0x64, 0x44, 0x77, 0xc6, 0x22, 0x49, 0xf8, 0x48, 0x24, 0xf5, 0x63, 0xa8, 0x74, 0x78,
-	0x72, 0xeb, 0x4a, 0x2e, 0xa7, 0x49, 0x83, 0x4b, 0x4e, 0x5f, 0x41, 0x51, 0xfa, 0x63, 0x91, 0x48,
-	0x3e, 0x9e, 0x68, 0xb9, 0x5a, 0xfe, 0xa8, 0xc0, 0x16, 0x40, 0xfd, 0x16, 0x4a, 0x68, 0x2b, 0xba,
-	0x13, 0x8f, 0x4b, 0x41, 0x2b, 0x90, 0xf7, 0x3d, 0x2d, 0x57, 0xcb, 0x1d, 0x15, 0x59, 0xde, 0xf7,
-	0xe8, 0x21, 0x6c, 0x26, 0xa8, 0xd6, 0xf2, 0x0a, 0x4a, 0x05, 0xaa, 0xc1, 0x76, 0x16, 0x50, 0x2b,
-	0x28, 0x7c, 0x26, 0xae, 0x06, 0xdb, 0x50, 0xba, 0xa5, 0x60, 0x67, 0xb0, 0xbb, 0x14, 0x2c, 0xa1,
-	0xbf, 0x87, 0x52, 0xb2, 0x90, 0xb5, 0x5c, 0xad, 0x70, 0x54, 0x3a, 0x79, 0x7e, 0x3c, 0x4b, 0xe6,
-	0x78, 0xc9, 0x98, 0x2d, 0x5b, 0xd6, 0xff, 0x52, 0x80, 0x1d, 0x4c, 0xd3, 0x0a, 0x87, 0x11, 0xad,
-	0x41, 0x69, 0x10, 0x85, 0x92, 0xfb, 0xa1, 0x88, 0xad, 0xd9, 0xe6, 0x97, 0x21, 0xfa, 0x02, 0xb6,
-	0x24, 0x5a, 0x7b, 0x59, 0x1a, 0x99, 0x44, 0xab, 0xb0, 0x73, 0x13, 0x25, 0xd2, 0xe6, 0xe3, 0x59,
-	0x22, 0x73, 0x19, 0x73, 0x4c, 0x02, 0x7e, 0x27, 0x2c, 0x2f, 0xcb, 0x63, 0x26, 0xd2, 0xdf, 0xc2,
-	0x56, 0xa2, 0xe8, 0xd5, 0x36, 0x6b, 0xb9, 0xa3, 0xca, 0xc9, 0xcb, 0xc5, 0x86, 0x67, 0x7b, 0x3a,
-	0x4e, 0xf9, 0x67, 0x99, 0xe1, 0x32, 0x61, 0x5b, 0xab, 0x84, 0xfd, 0x08, 0x07, 0x22, 0xbc, 0xf3,
-	0xe3, 0x28, 0x1c, 0x8b, 0x50, 0x5e, 0xf2, 0xd8, 0xe7, 0xd7, 0x81, 0xd0, 0xb6, 0x15, 0x15, 0x6f,
-	0xd7, 0x78, 0x36, 0x1f, 0x5b, 0xb3, 0x75, 0x2e, 0xaa, 0x3f, 0xc0, 0xc1, 0x1a, 0x5b, 0x4a, 0x61,
-	0x23, 0xc4, 0x7c, 0x53, 0x9a, 0xd4, 0x37, 0x9e, 0xf2, 0x1d, 0x0f, 0xa6, 0xf3, 0x53, 0x56, 0x42,
-	0xfd, 0x18, 0xb6, 0xd2, 0x34, 0x68, 0x09, 0xb6, 0x59, 0xd7, 0xb6, 0x2d, 0xfb, 0x8c, 0x3c, 0xa3,
-	0x00, 0x5b, 0x1f, 0x75, 0xab, 0x69, 0x36, 0x48, 0x0e, 0x15, 0x6e, 0xc7, 0x69, 0xb7, 0xcd, 0x06,
-	0xc9, 0xd7, 0xff, 0x5a, 0x85, 0xb2, 0x31, 0x67, 0x1d, 0x4f, 0xe6, 0x15, 0x14, 0xfd, 0x31, 0x1f,
-	0x09, 0x7b, 0x11, 0x70, 0x01, 0x20, 0x29, 0x83, 0x68, 0x3c, 0xe6, 0xe1, 0xec, 0x58, 0x66, 0x22,
-	0x7d, 0x0b, 0x95, 0xf9, 0xf1, 0xb5, 0xa3, 0x58, 0x26, 0xd9, 0xe9, 0x3c, 0x40, 0x69, 0x0d, 0xb6,
-	0xef, 0x44, 0x9c, 0xf8, 0x51, 0x98, 0x9e, 0xd1, 0x87, 0xad, 0x00, 0xeb, 0x4a, 0xb2, 0x19, 0x4c,
-	0xf9, 0x7a, 0x7a, 0x37, 0x15, 0xbd, 0xbf, 0x5e, 0xd0, 0xbb, 0xb2, 0xef, 0x75, 0x1c, 0x9f, 0xe6,
-	0xb5, 0xdc, 0x5a, 0x9e, 0x91, 0xbc, 0x9f, 0xa2, 0x6b, 0xcb, 0xcb, 0x4e, 0x36, 0x15, 0xe8, 0x11,
-	0xec, 0x05, 0xd1, 0xa8, 0x3b, 0x09, 0x22, 0xee, 0x31, 0x31, 0x12, 0x9f, 0x27, 0xda, 0xb6, 0xd2,
-	0x3f, 0x84, 0xe9, 0x77, 0xb0, 0x3f, 0xe6, 0x9f, 0xcf, 0x05, 0x0f, 0xe4, 0xcd, 0x47, 0xee, 0x07,
-	0xd3, 0x58, 0x24, 0xda, 0x4e, 0x2d, 0x77, 0x54, 0x66, 0x8f, 0x15, 0x48, 0xcd, 0x8d, 0x42, 0x8c,
-	0x1b, 0x31, 0xb8, 0x35, 0xc6, 0x9e, 0x56, 0xac, 0x15, 0x90, 0x9a, 0x55, 0x94, 0xda, 0x50, 0x49,
-	0x42, 0x3e, 0x49, 0x6e, 0x22, 0xd9, 0x8e, 0x02, 0x7f, 0x70, 0xaf, 0x81, 0x2a, 0xd6, 0xb7, 0x4f,
-	0xe5, 0xec, 0xae, 0x58, 0xb3, 0x07, 0xab, 0xe9, 0x1b, 0x28, 0x8b, 0x50, 0xc6, 0xf7, 0x93, 0xc8,
-	0x0f, 0x25, 0x86, 0x2d, 0xa9, 0xb0, 0xab, 0x20, 0xfd, 0x1e, 0xf6, 0x79, 0x10, 0x44, 0x03, 0x2e,
-	0x85, 0x35, 0xd1, 0x3d, 0x2f, 0x16, 0x49, 0xa2, 0xed, 0xd6, 0x72, 0x47, 0x3b, 0x1f, 0x36, 0x87,
-	0x3c, 0x48, 0x04, 0x7b, 0xac, 0x5f, 0x75, 0xed, 0xca, 0x58, 0x2b, 0x2b, 0xa2, 0x56, 0x41, 0xac,
-	0x16, 0x3e, 0x99, 0xa8, 0x4a, 0xaa, 0xa4, 0xd5, 0x92, 0x89, 0xb8, 0xfe, 0xa7, 0xe8, 0xfa, 0x2c,
-	0x8e, 0xa6, 0x13, 0x57, 0xf2, 0xc1, 0xad, 0xb6, 0x97, 0xae, 0x5f, 0x01, 0x91, 0xb8, 0x19, 0xd0,
-	0x10, 0x92, 0xfb, 0x81, 0x46, 0xd2, 0x9a, 0x5a, 0x45, 0xe9, 0x6b, 0x00, 0x9f, 0x8f, 0xdb, 0x71,
-	0x34, 0xf4, 0x03, 0xa1, 0xed, 0x2b, 0x9b, 0x25, 0x84, 0xf6, 0x60, 0x3f, 0x14, 0xf2, 0x53, 0x14,
-	0xdf, 0x1a, 0x51, 0x38, 0xf4, 0x47, 0x48, 0x9e, 0x46, 0x6b, 0xb9, 0xa3, 0xd2, 0xc9, 0x2f, 0x9f,
-	0xe2, 0xd6, 0x7e, 0xb8, 0x80, 0x3d, 0xf6, 0x41, 0x7f, 0x05, 0x64, 0xbe, 0x63, 0xf1, 0xe7, 0xa9,
-	0x08, 0x07, 0x42, 0x3b, 0x50, 0xe1, 0x1f, 0xe1, 0x48, 0x46, 0x38, 0x1d, 0x9f, 0x4d, 0xa6, 0x89,
-	0x76, 0xa8, 0x2a, 0x65, 0x26, 0xd2, 0x0b, 0x28, 0x8b, 0x61, 0xb2, 0xb4, 0xb5, 0xe7, 0xaa, 0xd4,
-	0xbf, 0x7d, 0xb2, 0xd4, 0x97, 0x8d, 0xd9, 0xea, 0x5a, 0x7a, 0x0e, 0xbb, 0x03, 0x3e, 0xe1, 0xd7,
-	0x7e, 0xe0, 0x4b, 0x5f, 0x24, 0xda, 0x0b, 0x95, 0xe6, 0x9b, 0xa7, 0x7c, 0x19, 0x4b, 0xb6, 0x6c,
-	0x65, 0x25, 0x6e, 0x6b, 0x2c, 0x24, 0x97, 0x71, 0x14, 0x1a, 0xb1, 0xf0, 0x12, 0xed, 0x0b, 0xe5,
-	0xea, 0xc9, 0x6d, 0xb5, 0x96, 0x8d, 0xd9, 0xea, 0x5a, 0x7a, 0x09, 0x7b, 0xd3, 0x44, 0xc4, 0xed,
-	0x38, 0xba, 0xf3, 0x3d, 0xe1, 0x99, 0xe1, 0x9d, 0xa6, 0xa9, 0x2c, 0xbf, 0x7b, 0xca, 0x5d, 0x77,
-	0xd5, 0xdc, 0xc4, 0xca, 0x62, 0x0f, 0x9d, 0xd0, 0x2b, 0x20, 0x6a, 0xb4, 0x2e, 0x3b, 0x7e, 0xa9,
-	0x1c, 0xff, 0xe6, 0x29, 0xc7, 0x9d, 0x07, 0xf6, 0xa9, 0xe7, 0x47, 0x6e, 0x70, 0x46, 0xa9, 0xc6,
-	0xd7, 0xf0, 0x47, 0x22, 0x91, 0x5a, 0x35, 0x9d, 0x51, 0x4b, 0x10, 0x3d, 0x81, 0x43, 0xbc, 0x1a,
-	0x9f, 0xb2, 0x5a, 0x39, 0x9d, 0xc6, 0x89, 0xf4, 0xc3, 0x91, 0xf6, 0x25, 0xde, 0x1e, 0xb6, 0x56,
-	0x87, 0x4d, 0xe6, 0xd6, 0x0f, 0x82, 0x1e, 0xf7, 0xa5, 0x2b, 0x06, 0x51, 0xe8, 0x25, 0xda, 0x2b,
-	0x55, 0x0e, 0x0f, 0x61, 0x6c, 0x32, 0xfe, 0x28, 0x8c, 0x62, 0xd1, 0xe4, 0xd3, 0x70, 0x70, 0x73,
-	0x36, 0xe5, 0xb1, 0xa7, 0x7d, 0xa5, 0x5c, 0x3f, 0x56, 0xd0, 0xdf, 0xc1, 0xf3, 0x2c, 0x5e, 0x22,
-	0x85, 0x37, 0xcf, 0x38, 0xd1, 0x5e, 0xab, 0x15, 0xeb, 0x95, 0xf4, 0x3d, 0x1c, 0x0c, 0xa7, 0x41,
-	0x70, 0xff, 0xc7, 0x29, 0x0f, 0xfc, 0xa1, 0x2f, 0x3c, 0x0b, 0xd3, 0xd3, 0xbe, 0x56, 0xb9, 0xae,
-	0x53, 0x61, 0xc9, 0x2b, 0x57, 0xc6, 0x64, 0x3a, 0xcf, 0xb7, 0xa6, 0x42, 0x3c, 0xc2, 0xb1, 0xcd,
-	0x5e, 0x73, 0x39, 0xb8, 0xd1, 0xbe, 0x51, 0x06, 0xa9, 0x40, 0x5b, 0x50, 0x49, 0xbe, 0x6f, 0x46,
-	0xa3, 0x26, 0xf6, 0x14, 0x3f, 0x0a, 0x13, 0xad, 0xfe, 0xef, 0xeb, 0xdd, 0x5d, 0xb6, 0x66, 0x0f,
-	0x16, 0xff, 0xdf, 0x33, 0xb3, 0xfa, 0xf7, 0x1c, 0xec, 0x3f, 0xba, 0xed, 0xb4, 0x06, 0x45, 0x11,
-	0xfa, 0x4d, 0xf4, 0x15, 0xa8, 0x27, 0x58, 0x51, 0x8d, 0x93, 0x05, 0x88, 0x2f, 0x91, 0x54, 0x10,
-	0x81, 0x7a, 0x55, 0x14, 0xd9, 0x5c, 0x5e, 0xdf, 0x54, 0xf3, 0xff, 0xa1, 0xa9, 0xbe, 0x85, 0x4a,
-	0x22, 0x06, 0xd3, 0xd8, 0x97, 0xf7, 0xaa, 0x75, 0xe0, 0x08, 0x55, 0x73, 0x62, 0x15, 0xa5, 0xc7,
-	0x40, 0xaf, 0x79, 0xe8, 0x7d, 0xf2, 0x3d, 0x79, 0xd3, 0xf4, 0xc7, 0xbe, 0x6c, 0x5d, 0x4f, 0x12,
-	0x35, 0x4d, 0xcb, 0x6c, 0x8d, 0xa6, 0xfa, 0xcf, 0x1c, 0x94, 0x57, 0x7a, 0x06, 0xf6, 0x22, 0x31,
-	0x4c, 0x3e, 0x26, 0xea, 0xe9, 0x95, 0xc7, 0xc6, 0x9c, 0x89, 0xd8, 0x4a, 0xc7, 0xd1, 0x34, 0x94,
-	0x6d, 0xec, 0xe1, 0x5a, 0x5e, 0x29, 0x97, 0x10, 0xda, 0x84, 0x9d, 0x71, 0x28, 0xdb, 0x22, 0x1e,
-	0xa7, 0x03, 0xbe, 0x72, 0xf2, 0xfe, 0x67, 0xb5, 0xa9, 0xe3, 0x96, 0xf2, 0x81, 0xeb, 0xd8, 0xdc,
-	0x03, 0x16, 0xad, 0x0a, 0xcc, 0x44, 0xc0, 0xa5, 0x7f, 0x27, 0x5a, 0xb3, 0xc0, 0xe9, 0xf3, 0x6d,
-	0xbd, 0xb2, 0xfe, 0x06, 0x60, 0xe1, 0x8d, 0x6e, 0x41, 0x9e, 0xf5, 0x48, 0x4e, 0xfd, 0x3a, 0x24,
-	0x8f, 0xbf, 0x3d, 0x87, 0x14, 0xaa, 0xff, 0xd8, 0x84, 0xdd, 0xe5, 0xee, 0x46, 0x75, 0x28, 0x70,
-	0xcf, 0x53, 0x2f, 0xd6, 0xca, 0xc9, 0xbb, 0x9f, 0xd3, 0x10, 0x17, 0xc2, 0x3d, 0xc3, 0xb5, 0xd4,
-	0x80, 0x0d, 0x2f, 0x8e, 0x26, 0x5a, 0xfe, 0x7f, 0xf3, 0xa1, 0x16, 0xd7, 0xff, 0xb6, 0x01, 0xb0,
-	0x00, 0x69, 0x11, 0x36, 0x8d, 0x73, 0xa7, 0x67, 0x93, 0x67, 0x94, 0xc0, 0x6e, 0x43, 0x37, 0xfa,
-	0xce, 0xa5, 0xc9, 0x98, 0xd5, 0x30, 0x49, 0x8e, 0x1e, 0xc0, 0x1e, 0x22, 0xcc, 0xd4, 0x1b, 0x7d,
-	0xd7, 0xd4, 0x99, 0x71, 0x4e, 0xf2, 0xea, 0x35, 0xe7, 0xf4, 0x6c, 0x93, 0x91, 0x82, 0xfa, 0x76,
-	0xcd, 0x8e, 0xd5, 0x20, 0x1b, 0x74, 0x07, 0x36, 0x2e, 0xac, 0x66, 0x93, 0x6c, 0x22, 0xea, 0x9a,
-	0x9d, 0x33, 0xab, 0x41, 0xb6, 0xb2, 0xef, 0xae, 0xd5, 0x20, 0xdb, 0xea, 0xed, 0x67, 0x76, 0xda,
-	0x86, 0xde, 0x26, 0x3b, 0xe8, 0xbb, 0x69, 0xd9, 0xdd, 0x1f, 0xfb, 0x56, 0xab, 0xd5, 0xed, 0xe8,
-	0xa7, 0x4d, 0x93, 0x14, 0xe9, 0x21, 0x10, 0xdb, 0xec, 0xf4, 0x4f, 0x2d, 0x1b, 0x03, 0xb2, 0x4b,
-	0xcb, 0x30, 0x09, 0xd0, 0x7d, 0x28, 0x2b, 0x94, 0x39, 0x7a, 0xc3, 0xd0, 0xdd, 0x0e, 0x29, 0xd1,
-	0x32, 0x14, 0x11, 0xd2, 0x1b, 0x2d, 0xcb, 0x26, 0xbb, 0xe8, 0x19, 0x45, 0xa6, 0xf7, 0x48, 0x99,
-	0xee, 0xc2, 0x8e, 0xd5, 0x36, 0xfa, 0x4d, 0xc7, 0xb8, 0x20, 0x15, 0xb4, 0x44, 0x29, 0xdd, 0xf1,
-	0x1e, 0xad, 0x00, 0xb8, 0x57, 0x6e, 0xbf, 0xe5, 0x34, 0xba, 0x4d, 0x93, 0x10, 0x54, 0xa3, 0xcc,
-	0xf4, 0x9e, 0xe5, 0x90, 0xfd, 0x99, 0xda, 0x38, 0x67, 0x8e, 0xd3, 0x21, 0x74, 0x26, 0xb7, 0x3b,
-	0x4c, 0x37, 0x4c, 0x72, 0x30, 0x33, 0x6f, 0xeb, 0x86, 0xd1, 0x21, 0x87, 0x33, 0x31, 0xdd, 0xc6,
-	0x73, 0x8c, 0x8c, 0xe2, 0x29, 0xae, 0x7d, 0x31, 0x93, 0x6c, 0x4c, 0xe2, 0x0b, 0x64, 0x57, 0x05,
-	0x32, 0x5d, 0xa7, 0xcb, 0x0c, 0x93, 0x68, 0x33, 0x7d, 0xc7, 0x6a, 0x99, 0xe4, 0x25, 0xa5, 0x50,
-	0x51, 0x52, 0xe7, 0xaa, 0x6f, 0x38, 0xf6, 0x47, 0xeb, 0x8c, 0x54, 0xf1, 0x70, 0x5a, 0x17, 0xb6,
-	0xd3, 0x20, 0x5f, 0xe2, 0x67, 0xd3, 0xd4, 0x5d, 0x93, 0xbc, 0xa2, 0x7b, 0x50, 0xd2, 0xbb, 0x0d,
-	0xab, 0xd3, 0xef, 0x31, 0xab, 0x63, 0x92, 0xaf, 0x90, 0x9f, 0x14, 0x30, 0x1c, 0xbb, 0xc3, 0x9c,
-	0x26, 0x79, 0x9d, 0x51, 0xfd, 0x11, 0xa9, 0xfe, 0x1a, 0x43, 0xb7, 0x96, 0x0f, 0xb6, 0x86, 0xfb,
-	0x46, 0x24, 0xdd, 0xf7, 0x37, 0xea, 0x90, 0xae, 0xdc, 0xa6, 0x73, 0x46, 0xea, 0x98, 0x71, 0x4f,
-	0xbf, 0x30, 0xfb, 0x7a, 0x53, 0x67, 0x2d, 0xf2, 0x0b, 0x74, 0x7e, 0x8a, 0x54, 0xf6, 0xdd, 0xae,
-	0xdb, 0x36, 0xed, 0x06, 0x79, 0x83, 0x26, 0x69, 0x3c, 0x2c, 0x0c, 0xf2, 0x6d, 0xd5, 0x85, 0xf2,
-	0xca, 0xf4, 0xc5, 0xd9, 0xc5, 0x27, 0x13, 0xc4, 0x3c, 0x2e, 0x79, 0x76, 0xc9, 0x97, 0x21, 0xb4,
-	0x18, 0x67, 0xdf, 0xae, 0x3f, 0xca, 0x6e, 0xfa, 0x32, 0x54, 0x3d, 0x85, 0xc3, 0x75, 0x33, 0x98,
-	0x12, 0x28, 0xdc, 0x8a, 0xfb, 0xac, 0xb1, 0xe2, 0xe7, 0xfa, 0xbe, 0xfa, 0x21, 0xff, 0x87, 0x5c,
-	0xd5, 0x80, 0xe7, 0x6b, 0xc7, 0xed, 0x7f, 0xe5, 0xe4, 0x07, 0x28, 0xaf, 0x8c, 0x00, 0xfc, 0x6f,
-	0x78, 0x3d, 0x1d, 0xdc, 0x0a, 0x99, 0x25, 0x96, 0x49, 0x88, 0x4f, 0x62, 0x31, 0xf4, 0x3f, 0x67,
-	0xe9, 0x64, 0x52, 0xdd, 0x82, 0xca, 0xea, 0x53, 0x19, 0x0f, 0xd3, 0x36, 0x2f, 0x4d, 0x46, 0x9e,
-	0x21, 0x97, 0x26, 0x63, 0x0e, 0xeb, 0x3b, 0x76, 0xf3, 0x8a, 0xe4, 0x54, 0x99, 0x74, 0x0d, 0xc3,
-	0x74, 0xdd, 0x14, 0x51, 0xf7, 0x4d, 0x6f, 0xf6, 0xf4, 0x2b, 0x97, 0x14, 0x4e, 0xdf, 0x43, 0xd5,
-	0x8f, 0x8e, 0xa5, 0x2f, 0x79, 0x38, 0x8c, 0xf9, 0x58, 0xe0, 0xd4, 0x98, 0xb7, 0x81, 0xd3, 0x52,
-	0x07, 0x15, 0x6d, 0xfc, 0x7f, 0x9f, 0xfc, 0x69, 0x53, 0xbd, 0x28, 0xfe, 0x15, 0x00, 0x00, 0xff,
-	0xff, 0xf1, 0x82, 0x04, 0xbf, 0x03, 0x10, 0x00, 0x00,
+	// 1748 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x57, 0xdf, 0x76, 0xe2, 0xc8,
+	0xd1, 0x1f, 0xc0, 0x7f, 0x0b, 0x83, 0xdb, 0x6d, 0xcf, 0xac, 0x86, 0x9d, 0x9d, 0x65, 0xf9, 0x66,
+	0xe7, 0xf8, 0xdb, 0x6c, 0x3c, 0x13, 0x27, 0xe7, 0x24, 0x67, 0x6f, 0xf6, 0xc8, 0x42, 0xb6, 0x75,
+	0x0c, 0x88, 0xb4, 0xc0, 0xac, 0x73, 0xc3, 0x69, 0xa3, 0x06, 0xf7, 0x5a, 0x48, 0x44, 0x6a, 0x3c,
+	0xe3, 0x27, 0xc8, 0x7d, 0x1e, 0x24, 0xcf, 0x92, 0xd7, 0xc8, 0x75, 0x5e, 0x20, 0xa7, 0x5a, 0x02,
+	0x83, 0x8d, 0x73, 0x36, 0xc9, 0x15, 0xfa, 0xfd, 0xaa, 0xba, 0xaa, 0xab, 0xba, 0xba, 0xaa, 0x81,
+	0xd7, 0xa1, 0x50, 0xc3, 0x40, 0x7e, 0xfe, 0xa0, 0xa4, 0x9a, 0x26, 0x1f, 0xf8, 0x48, 0x84, 0xea,
+	0x68, 0x12, 0x47, 0x2a, 0xa2, 0x5b, 0x63, 0x91, 0x24, 0x7c, 0x24, 0x92, 0xda, 0x11, 0x94, 0x3b,
+	0x3c, 0xb9, 0xf5, 0x14, 0x57, 0xd3, 0xa4, 0xce, 0x15, 0xa7, 0x6f, 0x60, 0x5b, 0xc9, 0xb1, 0x48,
+	0x14, 0x1f, 0x4f, 0x8c, 0x5c, 0x35, 0x7f, 0x58, 0x60, 0x0f, 0x44, 0xed, 0x16, 0x8a, 0xa8, 0x2b,
+	0xba, 0x13, 0x9f, 0x2b, 0x41, 0xcb, 0x90, 0x97, 0xbe, 0x91, 0xab, 0xe6, 0x0e, 0xb7, 0x59, 0x5e,
+	0xfa, 0xf4, 0x00, 0xd6, 0x13, 0x14, 0x1b, 0x79, 0x4d, 0xa5, 0x80, 0x1a, 0xb0, 0x99, 0x39, 0x34,
+	0x0a, 0x9a, 0x9f, 0xc1, 0x65, 0x67, 0x6b, 0x5a, 0xb6, 0xe0, 0xec, 0x0c, 0x76, 0x16, 0x9c, 0x25,
+	0xf4, 0xf7, 0x50, 0x4c, 0x1e, 0xb0, 0x91, 0xab, 0x16, 0x0e, 0x8b, 0xc7, 0x2f, 0x8f, 0x66, 0xc1,
+	0x1c, 0x2d, 0x28, 0xb3, 0x45, 0xcd, 0xda, 0x5f, 0x0b, 0xb0, 0x85, 0x61, 0x3a, 0xe1, 0x30, 0xa2,
+	0x55, 0x28, 0x0e, 0xa2, 0x50, 0x71, 0x19, 0x8a, 0xd8, 0x99, 0x6d, 0x7e, 0x91, 0xa2, 0xaf, 0x60,
+	0x43, 0xa1, 0xb6, 0x9f, 0x85, 0x91, 0x21, 0x5a, 0x81, 0xad, 0x9b, 0x28, 0x51, 0x2d, 0x3e, 0x9e,
+	0x05, 0x32, 0xc7, 0x18, 0x63, 0x12, 0xf0, 0x3b, 0xe1, 0xf8, 0x59, 0x1c, 0x33, 0x48, 0x7f, 0x03,
+	0x1b, 0x89, 0x4e, 0xaf, 0xb1, 0x5e, 0xcd, 0x1d, 0x96, 0x8f, 0x5f, 0x3f, 0x6c, 0x78, 0xb6, 0xa7,
+	0xa3, 0x34, 0xff, 0x2c, 0x53, 0x5c, 0x4c, 0xd8, 0xc6, 0x72, 0xc2, 0x7e, 0x82, 0x7d, 0x11, 0xde,
+	0xc9, 0x38, 0x0a, 0xc7, 0x22, 0x54, 0x97, 0x3c, 0x96, 0xfc, 0x3a, 0x10, 0xc6, 0xa6, 0x4e, 0xc5,
+	0xfb, 0x15, 0x96, 0xed, 0xa7, 0xda, 0x6c, 0x95, 0x89, 0xca, 0x8f, 0xb0, 0xbf, 0x42, 0x97, 0x52,
+	0x58, 0x0b, 0x31, 0xde, 0x34, 0x4d, 0xfa, 0x1b, 0x4f, 0xf9, 0x8e, 0x07, 0xd3, 0xf9, 0x29, 0x6b,
+	0x50, 0x3b, 0x82, 0x8d, 0x34, 0x0c, 0x5a, 0x84, 0x4d, 0xd6, 0x6d, 0xb5, 0x9c, 0xd6, 0x19, 0x79,
+	0x41, 0x01, 0x36, 0x4e, 0x4d, 0xa7, 0x61, 0xd7, 0x49, 0x0e, 0x05, 0x5e, 0xc7, 0x6d, 0xb7, 0xed,
+	0x3a, 0xc9, 0xd7, 0xfe, 0xf6, 0x1a, 0x4a, 0xd6, 0x3c, 0xeb, 0x78, 0x32, 0x6f, 0x60, 0x5b, 0x8e,
+	0xf9, 0x48, 0xb4, 0x1e, 0x1c, 0x3e, 0x10, 0x98, 0x94, 0x41, 0x34, 0x1e, 0xf3, 0x70, 0x76, 0x2c,
+	0x33, 0x48, 0xdf, 0x43, 0x79, 0x7e, 0x7c, 0xed, 0x28, 0x56, 0x49, 0x76, 0x3a, 0x8f, 0x58, 0x5a,
+	0x85, 0xcd, 0x3b, 0x11, 0x27, 0x32, 0x0a, 0xd3, 0x33, 0xfa, 0x61, 0x23, 0xc0, 0xba, 0x52, 0x6c,
+	0x46, 0x53, 0xbe, 0x3a, 0xbd, 0xeb, 0x3a, 0xbd, 0xbf, 0x7a, 0x48, 0xef, 0xd2, 0xbe, 0x57, 0xe5,
+	0xf8, 0x24, 0x6f, 0xe4, 0x56, 0xe6, 0x19, 0x93, 0xf7, 0x73, 0x74, 0xed, 0xf8, 0xd9, 0xc9, 0xa6,
+	0x80, 0x1e, 0xc2, 0x6e, 0x10, 0x8d, 0xba, 0x93, 0x20, 0xe2, 0x3e, 0x13, 0x23, 0xf1, 0x79, 0x62,
+	0x6c, 0x6a, 0xf9, 0x63, 0x9a, 0x7e, 0x84, 0xbd, 0x31, 0xff, 0x7c, 0x2e, 0x78, 0xa0, 0x6e, 0x4e,
+	0xb9, 0x0c, 0xa6, 0xb1, 0x48, 0x8c, 0xad, 0x6a, 0xee, 0xb0, 0xa4, 0x7d, 0x3e, 0x15, 0xd2, 0xef,
+	0xa0, 0x7c, 0xa3, 0x19, 0xeb, 0x46, 0x0c, 0x6e, 0xad, 0xb1, 0x6f, 0x6c, 0x57, 0x0b, 0x87, 0xdb,
+	0x5a, 0xfd, 0x91, 0x84, 0x32, 0x28, 0x27, 0x21, 0x9f, 0x24, 0x37, 0x91, 0x6a, 0x47, 0x81, 0x1c,
+	0xdc, 0x1b, 0xa0, 0x8b, 0xf6, 0xfd, 0x73, 0xb1, 0x7b, 0x4b, 0xda, 0xa9, 0xcd, 0x65, 0x0b, 0xf4,
+	0x1d, 0x94, 0x44, 0xa8, 0xe2, 0xfb, 0x49, 0x24, 0x43, 0x85, 0xee, 0x8b, 0xe8, 0x9e, 0x2d, 0x93,
+	0xcb, 0x5a, 0x9e, 0x8a, 0x8d, 0x92, 0x8e, 0x7f, 0x99, 0xc4, 0x22, 0xe0, 0x93, 0x89, 0x2e, 0x90,
+	0x72, 0x5a, 0x04, 0x19, 0xc4, 0xf5, 0x3f, 0x47, 0xd7, 0x67, 0x71, 0x34, 0x9d, 0x78, 0x8a, 0x0f,
+	0x6e, 0x8d, 0xdd, 0x74, 0xfd, 0x12, 0x89, 0xa5, 0x32, 0x23, 0xea, 0x42, 0x71, 0x19, 0x18, 0x24,
+	0x2d, 0x95, 0x65, 0x96, 0xbe, 0x05, 0x90, 0x7c, 0xdc, 0x8e, 0xa3, 0xa1, 0x0c, 0x84, 0xb1, 0xa7,
+	0x75, 0x16, 0x18, 0xda, 0x83, 0xbd, 0x50, 0xa8, 0x4f, 0x51, 0x7c, 0x6b, 0x45, 0xe1, 0x50, 0x8e,
+	0x30, 0x17, 0x06, 0xad, 0xe6, 0x0e, 0x8b, 0xc7, 0xff, 0xff, 0x5c, 0xaa, 0x5a, 0x8f, 0x17, 0xb0,
+	0xa7, 0x36, 0xe8, 0x77, 0x40, 0xe6, 0x3b, 0x16, 0x7f, 0x9e, 0x8a, 0x70, 0x20, 0x8c, 0x7d, 0xed,
+	0xfe, 0x09, 0x8f, 0xc9, 0x08, 0xa7, 0xe3, 0xb3, 0xc9, 0x34, 0x31, 0x0e, 0xb0, 0x00, 0xd8, 0x0c,
+	0xd2, 0x0b, 0x28, 0x89, 0x61, 0xb2, 0xb0, 0xb5, 0x97, 0xba, 0x82, 0xbf, 0x7d, 0xb6, 0x82, 0x17,
+	0x95, 0xd9, 0xf2, 0x5a, 0x7a, 0x0e, 0x3b, 0x03, 0x3e, 0xe1, 0xd7, 0x32, 0x90, 0x4a, 0x8a, 0xc4,
+	0x78, 0xa5, 0xc3, 0x7c, 0xf7, 0x9c, 0x2d, 0x6b, 0x41, 0x97, 0x2d, 0xad, 0xc4, 0x6d, 0x8d, 0x85,
+	0xe2, 0x2a, 0x8e, 0x42, 0x2b, 0x16, 0x7e, 0x62, 0x7c, 0xa1, 0x4d, 0x3d, 0xbb, 0xad, 0xe6, 0xa2,
+	0x32, 0x5b, 0x5e, 0x4b, 0x2f, 0x61, 0x77, 0x9a, 0x88, 0xb8, 0x1d, 0x47, 0x77, 0xd2, 0x17, 0xbe,
+	0x1d, 0xde, 0x19, 0x86, 0x8e, 0xf2, 0xfb, 0xe7, 0xcc, 0x75, 0x97, 0xd5, 0x6d, 0xac, 0x2c, 0xf6,
+	0xd8, 0x08, 0xbd, 0x02, 0xa2, 0x27, 0xe6, 0xa2, 0xe1, 0xd7, 0xda, 0xf0, 0xaf, 0x9f, 0x33, 0xdc,
+	0x79, 0xa4, 0x9f, 0x5a, 0x7e, 0x62, 0x06, 0x47, 0x8f, 0xee, 0x67, 0x75, 0x39, 0x12, 0x89, 0x32,
+	0x2a, 0xe9, 0xe8, 0x59, 0xa0, 0xe8, 0x31, 0x1c, 0xf0, 0x20, 0x88, 0x3e, 0x65, 0xb5, 0x72, 0x32,
+	0x8d, 0x13, 0x25, 0xc3, 0x91, 0xf1, 0x65, 0x35, 0x77, 0xb8, 0xc5, 0x56, 0xca, 0xb0, 0x77, 0xdc,
+	0xca, 0x20, 0xe8, 0x71, 0xa9, 0x3c, 0x31, 0x88, 0x42, 0x3f, 0x31, 0xde, 0xe8, 0x72, 0x78, 0x4c,
+	0xd3, 0xef, 0x61, 0x4f, 0x8e, 0xc2, 0x28, 0x16, 0x0d, 0x3e, 0x0d, 0x07, 0x37, 0x67, 0x53, 0x1e,
+	0xfb, 0xc6, 0x57, 0xda, 0xf4, 0x53, 0x01, 0xfd, 0x1d, 0xbc, 0xcc, 0xfc, 0x25, 0x4a, 0xf8, 0xf3,
+	0x88, 0x13, 0xe3, 0xad, 0x5e, 0xb1, 0x5a, 0x48, 0x3f, 0xc2, 0xfe, 0x70, 0x1a, 0x04, 0xf7, 0x7f,
+	0x9c, 0xf2, 0x40, 0x0e, 0xa5, 0xf0, 0x1d, 0x0c, 0xcf, 0xf8, 0x5a, 0xc7, 0xba, 0x4a, 0x84, 0x25,
+	0xaf, 0x4d, 0x59, 0x93, 0xe9, 0x3c, 0xde, 0xaa, 0x76, 0xf1, 0x84, 0xc7, 0xee, 0x79, 0xcd, 0xd5,
+	0xe0, 0xc6, 0xf8, 0x46, 0x2b, 0xa4, 0x80, 0x36, 0xa1, 0x9c, 0xfc, 0xb6, 0x11, 0x8d, 0x1a, 0xd1,
+	0x80, 0x2b, 0x19, 0x85, 0x89, 0x51, 0xfb, 0xf7, 0xf5, 0xee, 0x2d, 0x6a, 0xb3, 0x47, 0x8b, 0xff,
+	0xe7, 0x51, 0x58, 0xf9, 0x4b, 0x0e, 0xf6, 0x9e, 0xdc, 0x76, 0x7c, 0x3e, 0x88, 0x50, 0x36, 0xf8,
+	0xb5, 0x08, 0xf4, 0x53, 0x60, 0x9b, 0xcd, 0x31, 0xf6, 0xa5, 0x44, 0x0c, 0xa6, 0xb1, 0x54, 0xf7,
+	0xfa, 0x8e, 0xe3, 0x08, 0xc3, 0x26, 0xf9, 0x88, 0xa5, 0x47, 0x40, 0xaf, 0x79, 0xe8, 0x7f, 0x92,
+	0xbe, 0xba, 0x69, 0xc8, 0xb1, 0x54, 0xcd, 0xeb, 0x49, 0xa2, 0xa7, 0x59, 0x89, 0xad, 0x90, 0x54,
+	0xfe, 0x99, 0x83, 0xd2, 0xd2, 0xe5, 0xc6, 0xa6, 0x21, 0x86, 0xc9, 0x69, 0xa2, 0x9f, 0x3e, 0x79,
+	0xec, 0xa0, 0x19, 0xc4, 0x9e, 0x37, 0x8e, 0xa6, 0xa1, 0x6a, 0x63, 0xb3, 0x35, 0xf2, 0x5a, 0xb8,
+	0xc0, 0xd0, 0x06, 0x6c, 0x8d, 0x43, 0xd5, 0x16, 0xf1, 0x38, 0x1d, 0xb0, 0xe5, 0xe3, 0x8f, 0xbf,
+	0xa8, 0x9f, 0x1c, 0x35, 0xb5, 0x0d, 0x5c, 0xc7, 0xe6, 0x16, 0xb0, 0xba, 0xb4, 0x63, 0x26, 0x02,
+	0xae, 0xe4, 0x9d, 0x68, 0xce, 0x1c, 0xa7, 0xcf, 0xa7, 0xd5, 0xc2, 0xda, 0x3b, 0x80, 0x07, 0x6b,
+	0x74, 0x03, 0xf2, 0xac, 0x47, 0x72, 0xfa, 0xd7, 0x25, 0x79, 0xfc, 0xed, 0xb9, 0xa4, 0x50, 0xf9,
+	0xc7, 0x3a, 0xec, 0x2c, 0xb6, 0x21, 0x6a, 0x42, 0x81, 0xfb, 0xbe, 0x7e, 0x31, 0x96, 0x8f, 0x3f,
+	0xfc, 0x92, 0xce, 0xf5, 0x00, 0xee, 0x19, 0xae, 0xa5, 0x16, 0xac, 0xf9, 0x71, 0x34, 0x31, 0xf2,
+	0xff, 0x9d, 0x0d, 0xbd, 0xb8, 0xf6, 0xf7, 0x35, 0x80, 0x07, 0x92, 0x6e, 0xc3, 0xba, 0x75, 0xee,
+	0xf6, 0x5a, 0xe4, 0x05, 0x25, 0xb0, 0x53, 0x37, 0xad, 0xbe, 0x7b, 0x69, 0x33, 0xe6, 0xd4, 0x6d,
+	0x92, 0xa3, 0xfb, 0xb0, 0x8b, 0x0c, 0xb3, 0xcd, 0x7a, 0xdf, 0xb3, 0x4d, 0x66, 0x9d, 0x93, 0xbc,
+	0x7e, 0x4d, 0xb9, 0xbd, 0x96, 0xcd, 0x48, 0x41, 0x7f, 0x7b, 0x76, 0xc7, 0xa9, 0x93, 0x35, 0xba,
+	0x05, 0x6b, 0x17, 0x4e, 0xa3, 0x41, 0xd6, 0x91, 0xf5, 0xec, 0xce, 0x99, 0x53, 0x27, 0x1b, 0xd9,
+	0x77, 0xd7, 0xa9, 0x93, 0x4d, 0xfd, 0xf6, 0xb2, 0x3b, 0x6d, 0xcb, 0x6c, 0x93, 0x2d, 0xb4, 0xdd,
+	0x70, 0x5a, 0xdd, 0x9f, 0xfa, 0x4e, 0xb3, 0xd9, 0xed, 0x98, 0x27, 0x0d, 0x9b, 0x6c, 0xd3, 0x03,
+	0x20, 0x2d, 0xbb, 0xd3, 0x3f, 0x71, 0x5a, 0xe8, 0x90, 0x5d, 0x3a, 0x96, 0x4d, 0x80, 0xee, 0x41,
+	0x49, 0xb3, 0xcc, 0x35, 0xeb, 0x96, 0xe9, 0x75, 0x48, 0x91, 0x96, 0x60, 0x1b, 0x29, 0xb3, 0xde,
+	0x74, 0x5a, 0x64, 0x07, 0x2d, 0x23, 0x64, 0x66, 0x8f, 0x94, 0xe8, 0x0e, 0x6c, 0x39, 0x6d, 0xab,
+	0xdf, 0x70, 0xad, 0x0b, 0x52, 0x46, 0x4d, 0x44, 0xe9, 0x8e, 0x77, 0x69, 0x19, 0xc0, 0xbb, 0xf2,
+	0xfa, 0x4d, 0xb7, 0xde, 0x6d, 0xd8, 0x84, 0xa0, 0x18, 0x31, 0x33, 0x7b, 0x8e, 0x4b, 0xf6, 0x66,
+	0x62, 0xeb, 0x9c, 0xb9, 0x6e, 0x87, 0xd0, 0x19, 0x6e, 0x77, 0x98, 0x69, 0xd9, 0x64, 0x7f, 0xa6,
+	0xde, 0x36, 0x2d, 0xab, 0x43, 0x0e, 0x66, 0x30, 0xdd, 0xc6, 0x4b, 0xf4, 0x8c, 0xf0, 0x04, 0xd7,
+	0xbe, 0x9a, 0xa1, 0x16, 0x06, 0xf1, 0x05, 0x66, 0x57, 0x3b, 0xb2, 0x3d, 0xb7, 0xcb, 0x2c, 0x9b,
+	0x18, 0x33, 0x79, 0xc7, 0x69, 0xda, 0xe4, 0x35, 0xa5, 0x50, 0xd6, 0xa8, 0x73, 0xd5, 0xb7, 0xdc,
+	0xd6, 0xa9, 0x73, 0x46, 0x2a, 0x78, 0x38, 0xcd, 0x8b, 0x96, 0x5b, 0x27, 0x5f, 0xe2, 0x67, 0xc3,
+	0x36, 0x3d, 0x9b, 0xbc, 0xa1, 0xbb, 0x50, 0x34, 0xbb, 0x75, 0xa7, 0xd3, 0xef, 0x31, 0xa7, 0x63,
+	0x93, 0xaf, 0x30, 0x3f, 0x29, 0x61, 0xb9, 0xad, 0x0e, 0x73, 0x1b, 0xe4, 0x6d, 0x96, 0xea, 0x53,
+	0x4c, 0xf5, 0xd7, 0xe8, 0xba, 0xb9, 0x78, 0xb0, 0x55, 0xdc, 0x37, 0x32, 0xe9, 0xbe, 0xbf, 0xd1,
+	0x87, 0x74, 0xe5, 0x35, 0xdc, 0x33, 0x52, 0xc3, 0x88, 0x7b, 0xe6, 0x85, 0xdd, 0x37, 0x1b, 0x26,
+	0x6b, 0x92, 0xff, 0x43, 0xe3, 0x27, 0x98, 0xca, 0xbe, 0xd7, 0xf5, 0xda, 0x76, 0xab, 0x4e, 0xde,
+	0xa1, 0x4a, 0xea, 0x0f, 0x0b, 0x83, 0x7c, 0x5b, 0xf1, 0xa0, 0xb4, 0x34, 0x26, 0x71, 0xc8, 0xf0,
+	0xc9, 0x04, 0x39, 0x9f, 0x2b, 0x9e, 0x5d, 0xf2, 0x45, 0x0a, 0x35, 0xc6, 0xd9, 0xb7, 0x27, 0x47,
+	0xd9, 0x4d, 0x5f, 0xa4, 0x2a, 0x27, 0x70, 0xb0, 0x6a, 0x58, 0x52, 0x02, 0x85, 0x5b, 0x71, 0x9f,
+	0x75, 0x40, 0xfc, 0x5c, 0xdd, 0x00, 0x7f, 0xc8, 0xff, 0x21, 0x57, 0xb1, 0xe0, 0xe5, 0xca, 0xb9,
+	0xf8, 0x1f, 0x19, 0xf9, 0x11, 0x4a, 0x4b, 0xbd, 0x1a, 0xff, 0x9b, 0x5d, 0x4f, 0x07, 0xb7, 0x42,
+	0x65, 0x81, 0x65, 0x08, 0xf9, 0x49, 0x2c, 0x86, 0xf2, 0x73, 0x16, 0x4e, 0x86, 0x6a, 0x0e, 0x94,
+	0x97, 0x9f, 0xa8, 0x78, 0x98, 0x2d, 0xfb, 0xd2, 0x66, 0xe4, 0x05, 0xe6, 0xd2, 0x66, 0xcc, 0x65,
+	0x7d, 0xb7, 0xd5, 0xb8, 0x22, 0x39, 0x5d, 0x26, 0x5d, 0xcb, 0xb2, 0x3d, 0x2f, 0x65, 0xf4, 0x7d,
+	0x33, 0x1b, 0x3d, 0xf3, 0xca, 0x23, 0x85, 0x93, 0x8f, 0x50, 0x91, 0xd1, 0x91, 0x92, 0x8a, 0x87,
+	0xc3, 0x98, 0x8f, 0x05, 0xb6, 0xf7, 0x79, 0x1b, 0x38, 0x29, 0x76, 0x50, 0xd0, 0xc6, 0xff, 0xd7,
+	0xc9, 0x9f, 0xd6, 0xf5, 0xe8, 0xff, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0xc0, 0xce, 0x33,
+	0x83, 0x0f, 0x00, 0x00,
 }
diff --git a/api/netflix/titus/titus_agent_api.pb.go b/api/netflix/titus/titus_agent_api.pb.go
index f32e1312a..38858ffa9 100644
--- a/api/netflix/titus/titus_agent_api.pb.go
+++ b/api/netflix/titus/titus_agent_api.pb.go
@@ -1046,6 +1046,30 @@ func (m *InstanceGroupLifecycleStateUpdate) GetDetail() string {
 	return ""
 }
 
+type InstanceGroupAttributesUpdate struct {
+	InstanceGroupId string            `protobuf:"bytes,1,opt,name=instanceGroupId" json:"instanceGroupId,omitempty"`
+	Attributes      map[string]string `protobuf:"bytes,2,rep,name=attributes" json:"attributes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+}
+
+func (m *InstanceGroupAttributesUpdate) Reset()                    { *m = InstanceGroupAttributesUpdate{} }
+func (m *InstanceGroupAttributesUpdate) String() string            { return proto.CompactTextString(m) }
+func (*InstanceGroupAttributesUpdate) ProtoMessage()               {}
+func (*InstanceGroupAttributesUpdate) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+
+func (m *InstanceGroupAttributesUpdate) GetInstanceGroupId() string {
+	if m != nil {
+		return m.InstanceGroupId
+	}
+	return ""
+}
+
+func (m *InstanceGroupAttributesUpdate) GetAttributes() map[string]string {
+	if m != nil {
+		return m.Attributes
+	}
+	return nil
+}
+
 type InstanceOverrideStateUpdate struct {
 	AgentInstanceId string                `protobuf:"bytes,1,opt,name=agentInstanceId" json:"agentInstanceId,omitempty"`
 	OverrideState   InstanceOverrideState `protobuf:"varint,2,opt,name=overrideState,enum=com.netflix.titus.InstanceOverrideState" json:"overrideState,omitempty"`
@@ -1055,7 +1079,7 @@ type InstanceOverrideStateUpdate struct {
 func (m *InstanceOverrideStateUpdate) Reset()                    { *m = InstanceOverrideStateUpdate{} }
 func (m *InstanceOverrideStateUpdate) String() string            { return proto.CompactTextString(m) }
 func (*InstanceOverrideStateUpdate) ProtoMessage()               {}
-func (*InstanceOverrideStateUpdate) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{15} }
+func (*InstanceOverrideStateUpdate) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{16} }
 
 func (m *InstanceOverrideStateUpdate) GetAgentInstanceId() string {
 	if m != nil {
@@ -1099,6 +1123,7 @@ func init() {
 	proto.RegisterType((*TierUpdate)(nil), "com.netflix.titus.TierUpdate")
 	proto.RegisterType((*AutoScalingRuleUpdate)(nil), "com.netflix.titus.AutoScalingRuleUpdate")
 	proto.RegisterType((*InstanceGroupLifecycleStateUpdate)(nil), "com.netflix.titus.InstanceGroupLifecycleStateUpdate")
+	proto.RegisterType((*InstanceGroupAttributesUpdate)(nil), "com.netflix.titus.InstanceGroupAttributesUpdate")
 	proto.RegisterType((*InstanceOverrideStateUpdate)(nil), "com.netflix.titus.InstanceOverrideStateUpdate")
 	proto.RegisterEnum("com.netflix.titus.InstanceLifecycleState", InstanceLifecycleState_name, InstanceLifecycleState_value)
 	proto.RegisterEnum("com.netflix.titus.InstanceOverrideState", InstanceOverrideState_name, InstanceOverrideState_value)
@@ -1109,106 +1134,108 @@ func init() {
 func init() { proto.RegisterFile("netflix/titus/titus_agent_api.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 1601 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x72, 0xdb, 0xc4,
-	0x17, 0xb7, 0x9c, 0x38, 0x1f, 0xc7, 0x91, 0xe3, 0x6c, 0x3e, 0xea, 0x71, 0xfb, 0x6f, 0x5d, 0xb5,
-	0x7f, 0xc6, 0x0d, 0x33, 0x4e, 0x71, 0x4b, 0xe9, 0x74, 0x80, 0x92, 0x36, 0x49, 0x93, 0xe9, 0x57,
-	0xba, 0x49, 0x80, 0x96, 0x8b, 0xce, 0x5a, 0xda, 0xd8, 0x4b, 0xe5, 0x95, 0x46, 0x5a, 0xa5, 0xf1,
-	0x2d, 0xc3, 0x0d, 0x37, 0x3c, 0x00, 0x2f, 0xc1, 0x13, 0xf0, 0x08, 0x5c, 0xc3, 0x15, 0xef, 0xc1,
-	0x70, 0xc3, 0x68, 0x25, 0xd9, 0x92, 0x2c, 0xc7, 0x36, 0x0c, 0x37, 0x1e, 0xed, 0xd9, 0x73, 0x7e,
-	0xe7, 0xec, 0xf9, 0xdc, 0x35, 0xdc, 0xe0, 0x54, 0x9c, 0x9a, 0xec, 0x7c, 0x4b, 0x30, 0xe1, 0xb9,
-	0xc1, 0xef, 0x5b, 0xd2, 0xa6, 0x5c, 0xbc, 0x25, 0x36, 0x6b, 0xd8, 0x8e, 0x25, 0x2c, 0xb4, 0xa2,
-	0x5b, 0xdd, 0x46, 0xc8, 0xd8, 0x90, 0x2c, 0xd5, 0xcb, 0x6d, 0xcb, 0x6a, 0x9b, 0x74, 0x4b, 0x32,
-	0xb4, 0xbc, 0xd3, 0x2d, 0xda, 0xb5, 0x45, 0x2f, 0xe0, 0xaf, 0x5e, 0xcd, 0x02, 0x6d, 0x11, 0x97,
-	0x06, 0xfb, 0xda, 0xf7, 0x0a, 0x5c, 0x3a, 0xe0, 0xae, 0x20, 0x5c, 0xa7, 0xcf, 0xd8, 0x29, 0xd5,
-	0x7b, 0xba, 0x49, 0x8f, 0x04, 0x11, 0x9e, 0x8b, 0x1e, 0x42, 0xc1, 0x15, 0x44, 0xd0, 0x8a, 0x52,
-	0x53, 0xea, 0xa5, 0xe6, 0xad, 0xc6, 0x90, 0xee, 0x46, 0xa6, 0x28, 0xc5, 0x81, 0x1c, 0xaa, 0xc3,
-	0xb2, 0x49, 0x3c, 0xae, 0x77, 0x8e, 0x59, 0x97, 0xba, 0x82, 0x74, 0xed, 0xca, 0x4c, 0x4d, 0xa9,
-	0xcf, 0xe2, 0x34, 0x59, 0xfb, 0x51, 0x81, 0x8d, 0x08, 0xeb, 0xe5, 0x19, 0x75, 0x1c, 0x66, 0x44,
-	0x56, 0x7c, 0x9e, 0xb4, 0xa2, 0x7e, 0x81, 0x15, 0x71, 0xc9, 0xbe, 0x11, 0x1b, 0x30, 0x67, 0x50,
-	0x41, 0x98, 0x59, 0xc9, 0xd7, 0x94, 0xfa, 0x22, 0x0e, 0x57, 0xe8, 0x0a, 0x2c, 0x8a, 0x94, 0x59,
-	0x03, 0x82, 0xf6, 0x9b, 0x02, 0x4b, 0xfb, 0x94, 0x98, 0xa2, 0x13, 0x9a, 0x51, 0x85, 0x05, 0xd7,
-	0xf2, 0x1c, 0x9d, 0x1e, 0x18, 0xd2, 0x92, 0x45, 0xdc, 0x5f, 0xa3, 0xbb, 0x91, 0x89, 0x79, 0x69,
-	0xe2, 0xd5, 0x0c, 0x13, 0x07, 0x58, 0x19, 0x86, 0xcd, 0x8c, 0x36, 0x6c, 0x36, 0x65, 0x18, 0x7a,
-	0x08, 0xa0, 0x5b, 0x5d, 0xdb, 0xe2, 0x94, 0x0b, 0xb7, 0x52, 0xa8, 0xcd, 0xd4, 0x8b, 0xcd, 0x6b,
-	0x17, 0x2a, 0xf4, 0x5c, 0x1c, 0x13, 0xd1, 0x7e, 0x52, 0xe0, 0x4a, 0xe4, 0xb0, 0x27, 0x8e, 0xe5,
-	0xd9, 0xe9, 0xb0, 0xef, 0x24, 0x1d, 0xde, 0xb8, 0xc0, 0xe1, 0xc3, 0xf2, 0xff, 0xd2, 0xed, 0xdf,
-	0xcd, 0x82, 0xba, 0xed, 0xa7, 0x7c, 0xa4, 0x01, 0x95, 0x20, 0xcf, 0x22, 0x8f, 0xe7, 0x99, 0xe1,
-	0xe7, 0x14, 0x8b, 0x6b, 0x3f, 0x30, 0x42, 0x05, 0x69, 0xb2, 0xaf, 0x89, 0xd9, 0xdb, 0x86, 0xe1,
-	0x50, 0xd7, 0x0d, 0x5d, 0x3c, 0x20, 0xf8, 0xf1, 0xec, 0x58, 0xae, 0xe0, 0xa4, 0x4b, 0xa5, 0x93,
-	0x17, 0x71, 0x7f, 0x8d, 0x8e, 0x61, 0xd9, 0x4c, 0x3a, 0xa5, 0x52, 0xa8, 0x29, 0xf5, 0x62, 0x73,
-	0x73, 0xd2, 0x12, 0xf0, 0x5c, 0x9c, 0x86, 0x40, 0xaf, 0xa0, 0x64, 0x25, 0x52, 0xbb, 0x32, 0x27,
-	0x41, 0x6f, 0x4d, 0x98, 0xd1, 0x9e, 0x8b, 0x53, 0x00, 0xe8, 0x31, 0x2c, 0x75, 0x62, 0x71, 0xae,
-	0xcc, 0x4b, 0xc0, 0xb1, 0xe9, 0x90, 0x10, 0x42, 0x87, 0x00, 0x44, 0x08, 0x87, 0xb5, 0x3c, 0x41,
-	0xdd, 0xca, 0x82, 0xcc, 0xa8, 0xdb, 0x19, 0x10, 0x89, 0xb8, 0x34, 0xb6, 0xfb, 0x22, 0xbb, 0x5c,
-	0x38, 0x3d, 0x1c, 0xc3, 0xa8, 0x7e, 0x06, 0xcb, 0xa9, 0x6d, 0x54, 0x86, 0x99, 0x77, 0xb4, 0x17,
-	0xc6, 0xd1, 0xff, 0x44, 0x6b, 0x50, 0x38, 0x23, 0xa6, 0x47, 0xc3, 0xf0, 0x05, 0x8b, 0x07, 0xf9,
-	0xfb, 0x8a, 0xf6, 0xa7, 0x02, 0xea, 0xb6, 0x27, 0xac, 0x23, 0x9d, 0x98, 0x14, 0x7b, 0x26, 0xf5,
-	0xa5, 0xbb, 0x8c, 0x4b, 0x69, 0x15, 0xfb, 0x9f, 0x92, 0x42, 0xce, 0xa5, 0xac, 0x4f, 0x21, 0xe7,
-	0xe8, 0x26, 0xa8, 0x5d, 0xc6, 0x0f, 0x0c, 0x93, 0x1e, 0x5b, 0x4f, 0x29, 0x0d, 0x92, 0x4b, 0xc5,
-	0x49, 0xa2, 0xe4, 0x22, 0xe7, 0x31, 0xae, 0xd9, 0x90, 0x2b, 0x4e, 0x44, 0x35, 0x28, 0xea, 0x96,
-	0x65, 0xee, 0x58, 0xef, 0xf9, 0x11, 0xd5, 0x65, 0xf0, 0x67, 0x71, 0x9c, 0xe4, 0xa7, 0x8f, 0xed,
-	0x30, 0xcb, 0x61, 0xa2, 0x27, 0xc3, 0xa8, 0xe2, 0xfe, 0x1a, 0x3d, 0x80, 0x8a, 0xdb, 0xb1, 0x1c,
-	0x71, 0x4a, 0x4c, 0x73, 0xdb, 0xf8, 0xd6, 0x73, 0x05, 0xe3, 0xed, 0x3d, 0xa2, 0x0b, 0xcb, 0x91,
-	0x11, 0x52, 0xf1, 0xc8, 0x7d, 0xed, 0x8f, 0x02, 0xa0, 0x84, 0xa3, 0x65, 0x36, 0x0f, 0x55, 0x81,
-	0x06, 0x4b, 0x51, 0xba, 0x1f, 0xf7, 0xec, 0xc8, 0x87, 0x09, 0x1a, 0xc2, 0xb0, 0x12, 0xad, 0x31,
-	0x0d, 0x7a, 0x55, 0x50, 0x07, 0xc5, 0xe6, 0xcd, 0x8c, 0xf0, 0x46, 0x3c, 0x3b, 0xac, 0x4b, 0xb9,
-	0xcb, 0x2c, 0x8e, 0x87, 0xc5, 0xd1, 0x87, 0x30, 0x2b, 0x18, 0x75, 0xa4, 0xd7, 0x4a, 0xcd, 0x4b,
-	0x19, 0x30, 0xc7, 0x8c, 0x3a, 0x58, 0x32, 0x45, 0x51, 0x2b, 0x0c, 0xa2, 0x56, 0x81, 0x79, 0x83,
-	0xba, 0xcc, 0xa1, 0x46, 0xe8, 0xb4, 0x68, 0xe9, 0xef, 0xe8, 0x9e, 0xe3, 0x50, 0x2e, 0x42, 0x17,
-	0x45, 0xcb, 0x28, 0xd2, 0x0b, 0x83, 0x48, 0xfb, 0x2d, 0xc0, 0x7d, 0x26, 0x27, 0xc8, 0x2e, 0x27,
-	0x2d, 0x93, 0x1a, 0x95, 0xc5, 0x9a, 0x52, 0x5f, 0xc0, 0x69, 0x32, 0x6a, 0x00, 0x62, 0xee, 0x31,
-	0x75, 0xba, 0x8c, 0x13, 0x41, 0x23, 0x66, 0x90, 0xcc, 0x19, 0x3b, 0x68, 0x0f, 0x54, 0x12, 0x4f,
-	0xbc, 0x4a, 0x51, 0xba, 0xab, 0x96, 0x55, 0x0d, 0x71, 0x3e, 0x9c, 0x14, 0x43, 0xaf, 0x87, 0x1b,
-	0xc8, 0x92, 0x44, 0xda, 0x9a, 0xaa, 0x99, 0x66, 0x75, 0x91, 0x8c, 0x99, 0xaa, 0x66, 0xce, 0x54,
-	0x74, 0x92, 0xa8, 0xeb, 0x92, 0xac, 0xeb, 0x8f, 0xc7, 0xd5, 0xb5, 0x34, 0xe2, 0xbf, 0x2c, 0xee,
-	0xdf, 0xe7, 0xa0, 0x2c, 0x35, 0x3e, 0xee, 0x10, 0xde, 0xa6, 0xbb, 0x67, 0x7e, 0x8c, 0xdf, 0xc1,
-	0x6a, 0xa2, 0x7b, 0x9f, 0xd8, 0x46, 0x34, 0x80, 0x8a, 0xcd, 0x4f, 0x46, 0xd9, 0x1c, 0x43, 0x48,
-	0x3a, 0x31, 0x10, 0xdf, 0xcf, 0xe1, 0x2c, 0x54, 0xc4, 0x61, 0x2d, 0x41, 0xc6, 0xb4, 0x6b, 0x9d,
-	0xd1, 0x60, 0x8c, 0x14, 0x9b, 0xf7, 0xa7, 0xd6, 0x16, 0xca, 0xef, 0xe7, 0x70, 0x26, 0x2e, 0x3a,
-	0x85, 0x55, 0x12, 0x77, 0x71, 0x78, 0xb8, 0xa0, 0x12, 0x9b, 0xd3, 0xa8, 0x1b, 0x9c, 0x2b, 0x03,
-	0x10, 0x31, 0x58, 0x4b, 0x90, 0xa3, 0x73, 0xcd, 0x4a, 0x45, 0x77, 0xa6, 0x51, 0x14, 0x3b, 0x52,
-	0x16, 0x24, 0x3a, 0x82, 0xa2, 0xcb, 0x89, 0xed, 0x76, 0x2c, 0xb1, 0xcb, 0x8d, 0x70, 0x38, 0x6e,
-	0x4d, 0xa2, 0xe1, 0x68, 0x20, 0xb6, 0x9f, 0xc3, 0x71, 0x94, 0x6a, 0x0b, 0x56, 0x33, 0xa2, 0x88,
-	0x9e, 0x82, 0x9a, 0x70, 0x6b, 0x98, 0x15, 0xff, 0x9f, 0x28, 0x93, 0x71, 0x52, 0xb6, 0xfa, 0x05,
-	0xac, 0x65, 0xc5, 0x2e, 0xeb, 0x56, 0xa1, 0x64, 0xde, 0x2a, 0xaa, 0x2f, 0xa0, 0x94, 0xf2, 0xfb,
-	0xa7, 0xb0, 0x10, 0x31, 0x85, 0xb6, 0xd5, 0xc6, 0xd9, 0x86, 0xfb, 0x12, 0xd5, 0x8f, 0x60, 0x39,
-	0xed, 0xdd, 0xab, 0x00, 0xd1, 0x76, 0xdf, 0x8e, 0x18, 0xa5, 0xaa, 0x42, 0x31, 0xe6, 0xc6, 0x47,
-	0xf3, 0x50, 0x90, 0xbe, 0xd5, 0xfe, 0x52, 0x00, 0xa4, 0x9a, 0x57, 0x1e, 0x75, 0x7a, 0x7e, 0xaf,
-	0xb6, 0x49, 0x3b, 0xb2, 0x29, 0xab, 0x57, 0x1f, 0x92, 0x36, 0xc5, 0x92, 0x09, 0xb5, 0x60, 0xe5,
-	0x94, 0x99, 0x82, 0x3a, 0x8c, 0xb7, 0x1f, 0x3b, 0xcc, 0xff, 0x20, 0x95, 0xbc, 0xec, 0x19, 0x77,
-	0x47, 0x9d, 0x46, 0xaa, 0x69, 0xec, 0xa5, 0xc5, 0x82, 0x96, 0x31, 0x0c, 0xe7, 0x5f, 0x09, 0x4f,
-	0x19, 0x35, 0x8d, 0xe0, 0xda, 0xba, 0x88, 0xc3, 0x55, 0x75, 0x07, 0x36, 0xb2, 0x41, 0xa6, 0x6a,
-	0x2c, 0x6b, 0x90, 0x3f, 0x30, 0xd2, 0x83, 0x52, 0xe3, 0xb0, 0x3a, 0x9c, 0x15, 0x2e, 0xfa, 0x2a,
-	0x55, 0x93, 0x01, 0xb9, 0xa2, 0xc8, 0x03, 0x4f, 0x98, 0x5a, 0x59, 0x08, 0xda, 0x1b, 0x28, 0x25,
-	0x58, 0x5d, 0xb4, 0x0f, 0xa5, 0x04, 0x63, 0xa4, 0x65, 0x7c, 0x92, 0xa4, 0xe4, 0x34, 0x1d, 0xc0,
-	0x9f, 0xae, 0x61, 0xda, 0x4d, 0x9c, 0xb2, 0xfd, 0xa1, 0x9d, 0x9f, 0x60, 0x68, 0x6b, 0x3f, 0x28,
-	0xb0, 0x1e, 0xcd, 0x36, 0xc6, 0xdb, 0xfe, 0x38, 0x9b, 0x5a, 0xe1, 0xd0, 0x18, 0xcd, 0xff, 0xa3,
-	0x31, 0xaa, 0xfd, 0xa2, 0xc0, 0xf5, 0x0b, 0x9e, 0x1a, 0x53, 0xdb, 0xf5, 0x25, 0x94, 0x12, 0xe3,
-	0x34, 0x7a, 0xb0, 0x4d, 0xfb, 0xc4, 0x49, 0xa1, 0x8c, 0x7a, 0xc9, 0x69, 0x3f, 0x2b, 0x70, 0x39,
-	0xf3, 0x6d, 0x3a, 0xb0, 0x3c, 0x11, 0xe2, 0x81, 0xe5, 0x29, 0x32, 0x7a, 0x01, 0x6a, 0xfc, 0xea,
-	0x1f, 0x19, 0x3e, 0xf9, 0x63, 0x38, 0x29, 0x3e, 0xca, 0xe2, 0xcd, 0xd7, 0x83, 0x67, 0x78, 0xf2,
-	0xcc, 0x08, 0x41, 0xe9, 0x48, 0x10, 0x47, 0x1c, 0x70, 0x26, 0x18, 0x11, 0xd4, 0x28, 0xe7, 0x50,
-	0x11, 0xe6, 0x25, 0x8d, 0x1a, 0x65, 0x05, 0xad, 0x80, 0xfa, 0x94, 0x99, 0xe6, 0x60, 0x3f, 0x1f,
-	0xec, 0x5b, 0xb6, 0x4d, 0x8d, 0xf2, 0xcc, 0xe6, 0x03, 0x58, 0xcf, 0x34, 0x0d, 0x95, 0x61, 0xe9,
-	0x85, 0x25, 0x22, 0x1a, 0x2f, 0xe7, 0xd0, 0x32, 0x14, 0x5f, 0x79, 0xc4, 0x21, 0x5c, 0x30, 0xee,
-	0x63, 0x6f, 0xde, 0x83, 0x62, 0xec, 0x01, 0xed, 0xe3, 0x9e, 0xf0, 0x77, 0xdc, 0x7a, 0xcf, 0x03,
-	0x23, 0x82, 0xbd, 0x5e, 0x59, 0x41, 0x2a, 0x2c, 0x9e, 0xf0, 0x4e, 0xb8, 0xcc, 0x6f, 0x9e, 0x0c,
-	0xfc, 0x9f, 0x11, 0x47, 0xb4, 0x04, 0x0b, 0x07, 0x9c, 0xe8, 0x82, 0x9d, 0xd1, 0x72, 0x0e, 0x01,
-	0xcc, 0x6d, 0x07, 0xdf, 0x12, 0xe7, 0xb0, 0x43, 0x5c, 0x6a, 0xbc, 0xf4, 0x44, 0x39, 0xef, 0x2f,
-	0x65, 0x73, 0xf6, 0x6f, 0x89, 0xe5, 0x99, 0xe6, 0xaf, 0x73, 0xb0, 0x21, 0x4b, 0xf5, 0x39, 0xe1,
-	0xa4, 0x4d, 0xbb, 0x94, 0x8b, 0x23, 0xea, 0x9c, 0x31, 0x9d, 0xa2, 0x13, 0x58, 0x79, 0x42, 0xd3,
-	0xdd, 0x66, 0xa3, 0x11, 0xfc, 0x45, 0xd3, 0x88, 0xfe, 0xa2, 0x69, 0xec, 0x76, 0x6d, 0xd1, 0xab,
-	0x7e, 0x30, 0x51, 0xa3, 0x71, 0xb5, 0x1c, 0xc2, 0x50, 0x4e, 0xc3, 0xa2, 0xf5, 0xac, 0xe0, 0x1b,
-	0xd5, 0xc9, 0xba, 0x97, 0x96, 0x43, 0xcf, 0x25, 0x66, 0xf2, 0xb5, 0x3d, 0x02, 0x73, 0x6c, 0xaf,
-	0xd2, 0x72, 0xe8, 0x6b, 0x40, 0x7b, 0x8c, 0x1b, 0xa9, 0xee, 0xf7, 0xbf, 0x0b, 0x87, 0x47, 0xf5,
-	0xfa, 0x38, 0xe0, 0xe0, 0xf0, 0x97, 0x82, 0x82, 0x49, 0x9c, 0xc0, 0xef, 0x59, 0x99, 0xf0, 0x83,
-	0x1e, 0x59, 0x1d, 0xe1, 0x78, 0x2d, 0x87, 0xbe, 0x81, 0xf5, 0x80, 0x27, 0xd5, 0xeb, 0x50, 0xfd,
-	0x82, 0x26, 0x95, 0xe8, 0x87, 0x17, 0x80, 0xbb, 0x70, 0x3d, 0xc3, 0xe0, 0x54, 0xf2, 0xdd, 0x9d,
-	0xae, 0xe9, 0x8c, 0x55, 0xda, 0x86, 0xcb, 0x49, 0xa5, 0xc9, 0x2a, 0x6b, 0x4c, 0xda, 0x2a, 0xc6,
-	0x2a, 0x3a, 0x04, 0xf5, 0x65, 0xcb, 0xa5, 0xce, 0x19, 0x95, 0x91, 0x1a, 0x9d, 0xde, 0x37, 0x26,
-	0xb8, 0x10, 0x6a, 0xb9, 0xdb, 0xca, 0xa3, 0x7b, 0x70, 0x6d, 0x98, 0xb3, 0xed, 0xd8, 0x7a, 0x80,
-	0xd8, 0xa6, 0xfc, 0x51, 0x70, 0xb1, 0x39, 0xf4, 0x97, 0x87, 0xca, 0x9b, 0x82, 0x64, 0x69, 0xcd,
-	0xc9, 0xed, 0x3b, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x10, 0x2c, 0x87, 0x3a, 0x15, 0x00,
-	0x00,
+	// 1645 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6,
+	0x16, 0x16, 0x65, 0xcb, 0x8f, 0x23, 0x4b, 0x96, 0xc7, 0x8f, 0x08, 0xca, 0x4b, 0x61, 0x72, 0x2f,
+	0x14, 0x5f, 0x40, 0xce, 0x55, 0x72, 0x73, 0x83, 0xe0, 0xde, 0x26, 0x4e, 0x6c, 0xc7, 0x46, 0x5e,
+	0x0e, 0x6d, 0xb7, 0x4d, 0xba, 0x48, 0x47, 0xe4, 0x58, 0x9a, 0x9a, 0x1a, 0x12, 0xe4, 0xd0, 0xb1,
+	0xb6, 0x45, 0x37, 0xdd, 0xf4, 0x07, 0xf4, 0x4f, 0x74, 0x5f, 0xa0, 0xbf, 0xa3, 0x5d, 0xf5, 0x07,
+	0xf4, 0x1f, 0x14, 0xdd, 0x14, 0x1c, 0x92, 0x12, 0x49, 0x8d, 0x5e, 0x2d, 0xb2, 0x11, 0x34, 0x67,
+	0xce, 0xf9, 0xce, 0x99, 0xf3, 0x9c, 0x21, 0xdc, 0x64, 0x84, 0x9f, 0x9a, 0xf4, 0x62, 0x8b, 0x53,
+	0xee, 0xb9, 0xc1, 0xef, 0x7b, 0xdc, 0x22, 0x8c, 0xbf, 0xc7, 0x36, 0xad, 0xdb, 0x8e, 0xc5, 0x2d,
+	0xb4, 0xa2, 0x5b, 0x9d, 0x7a, 0xc8, 0x58, 0x17, 0x2c, 0x95, 0xcb, 0x2d, 0xcb, 0x6a, 0x99, 0x64,
+	0x4b, 0x30, 0x34, 0xbd, 0xd3, 0x2d, 0xd2, 0xb1, 0x79, 0x37, 0xe0, 0xaf, 0x5c, 0x93, 0x81, 0x36,
+	0xb1, 0x4b, 0x82, 0x7d, 0xf5, 0x1b, 0x05, 0x2e, 0x1d, 0x30, 0x97, 0x63, 0xa6, 0x93, 0x17, 0xf4,
+	0x94, 0xe8, 0x5d, 0xdd, 0x24, 0x47, 0x1c, 0x73, 0xcf, 0x45, 0x8f, 0x20, 0xe7, 0x72, 0xcc, 0x49,
+	0x59, 0xa9, 0x2a, 0xb5, 0x62, 0xe3, 0x76, 0x7d, 0x40, 0x77, 0x5d, 0x2a, 0x4a, 0xb4, 0x40, 0x0e,
+	0xd5, 0x60, 0xd9, 0xc4, 0x1e, 0xd3, 0xdb, 0xc7, 0xb4, 0x43, 0x5c, 0x8e, 0x3b, 0x76, 0x79, 0xa6,
+	0xaa, 0xd4, 0x66, 0xb5, 0x34, 0x59, 0xfd, 0x4e, 0x81, 0x8d, 0x08, 0xeb, 0xf5, 0x39, 0x71, 0x1c,
+	0x6a, 0x44, 0x56, 0x7c, 0x92, 0xb4, 0xa2, 0x36, 0xc2, 0x8a, 0xb8, 0x64, 0xcf, 0x88, 0x0d, 0x98,
+	0x33, 0x08, 0xc7, 0xd4, 0x2c, 0x67, 0xab, 0x4a, 0x6d, 0x51, 0x0b, 0x57, 0xe8, 0x0a, 0x2c, 0xf2,
+	0x94, 0x59, 0x7d, 0x82, 0xfa, 0xb3, 0x02, 0x4b, 0xfb, 0x04, 0x9b, 0xbc, 0x1d, 0x9a, 0x51, 0x81,
+	0x05, 0xd7, 0xf2, 0x1c, 0x9d, 0x1c, 0x18, 0xc2, 0x92, 0x45, 0xad, 0xb7, 0x46, 0xf7, 0x22, 0x13,
+	0xb3, 0xc2, 0xc4, 0x6b, 0x12, 0x13, 0xfb, 0x58, 0x12, 0xc3, 0x66, 0x86, 0x1b, 0x36, 0x9b, 0x32,
+	0x0c, 0x3d, 0x02, 0xd0, 0xad, 0x8e, 0x6d, 0x31, 0xc2, 0xb8, 0x5b, 0xce, 0x55, 0x67, 0x6a, 0xf9,
+	0xc6, 0xf5, 0x91, 0x0a, 0x3d, 0x57, 0x8b, 0x89, 0xa8, 0xdf, 0x2b, 0x70, 0x25, 0x72, 0xd8, 0x33,
+	0xc7, 0xf2, 0xec, 0x74, 0xd8, 0x77, 0x92, 0x0e, 0xaf, 0x8f, 0x70, 0xf8, 0xa0, 0xfc, 0xdf, 0x74,
+	0xfb, 0xd7, 0xb3, 0x50, 0xd8, 0xf6, 0x53, 0x3e, 0xd2, 0x80, 0x8a, 0x90, 0xa5, 0x91, 0xc7, 0xb3,
+	0xd4, 0xf0, 0x73, 0x8a, 0xc6, 0xb5, 0x1f, 0x18, 0xa1, 0x82, 0x34, 0xd9, 0xd7, 0x44, 0xed, 0x6d,
+	0xc3, 0x70, 0x88, 0xeb, 0x86, 0x2e, 0xee, 0x13, 0xfc, 0x78, 0xb6, 0x2d, 0x97, 0x33, 0xdc, 0x21,
+	0xc2, 0xc9, 0x8b, 0x5a, 0x6f, 0x8d, 0x8e, 0x61, 0xd9, 0x4c, 0x3a, 0xa5, 0x9c, 0xab, 0x2a, 0xb5,
+	0x7c, 0x63, 0x73, 0xd2, 0x12, 0xf0, 0x5c, 0x2d, 0x0d, 0x81, 0xde, 0x40, 0xd1, 0x4a, 0xa4, 0x76,
+	0x79, 0x4e, 0x80, 0xde, 0x9e, 0x30, 0xa3, 0x3d, 0x57, 0x4b, 0x01, 0xa0, 0xa7, 0xb0, 0xd4, 0x8e,
+	0xc5, 0xb9, 0x3c, 0x2f, 0x00, 0xc7, 0xa6, 0x43, 0x42, 0x08, 0x1d, 0x02, 0x60, 0xce, 0x1d, 0xda,
+	0xf4, 0x38, 0x71, 0xcb, 0x0b, 0x22, 0xa3, 0xee, 0x48, 0x20, 0x12, 0x71, 0xa9, 0x6f, 0xf7, 0x44,
+	0x76, 0x19, 0x77, 0xba, 0x5a, 0x0c, 0xa3, 0xf2, 0x7f, 0x58, 0x4e, 0x6d, 0xa3, 0x12, 0xcc, 0x9c,
+	0x91, 0x6e, 0x18, 0x47, 0xff, 0x2f, 0x5a, 0x83, 0xdc, 0x39, 0x36, 0x3d, 0x12, 0x86, 0x2f, 0x58,
+	0x3c, 0xcc, 0x3e, 0x50, 0xd4, 0xdf, 0x15, 0x28, 0x6c, 0x7b, 0xdc, 0x3a, 0xd2, 0xb1, 0x49, 0x34,
+	0xcf, 0x24, 0xbe, 0x74, 0x87, 0x32, 0x21, 0x5d, 0xd0, 0xfc, 0xbf, 0x82, 0x82, 0x2f, 0x84, 0xac,
+	0x4f, 0xc1, 0x17, 0xe8, 0x16, 0x14, 0x3a, 0x94, 0x1d, 0x18, 0x26, 0x39, 0xb6, 0x9e, 0x13, 0x12,
+	0x24, 0x57, 0x41, 0x4b, 0x12, 0x05, 0x17, 0xbe, 0x88, 0x71, 0xcd, 0x86, 0x5c, 0x71, 0x22, 0xaa,
+	0x42, 0x5e, 0xb7, 0x2c, 0x73, 0xc7, 0xfa, 0xc0, 0x8e, 0x88, 0x2e, 0x82, 0x3f, 0xab, 0xc5, 0x49,
+	0x7e, 0xfa, 0xd8, 0x0e, 0xb5, 0x1c, 0xca, 0xbb, 0x22, 0x8c, 0x05, 0xad, 0xb7, 0x46, 0x0f, 0xa1,
+	0xec, 0xb6, 0x2d, 0x87, 0x9f, 0x62, 0xd3, 0xdc, 0x36, 0xbe, 0xf2, 0x5c, 0x4e, 0x59, 0x6b, 0x0f,
+	0xeb, 0xdc, 0x72, 0x44, 0x84, 0x0a, 0xda, 0xd0, 0x7d, 0xf5, 0xd7, 0x1c, 0xa0, 0x84, 0xa3, 0x45,
+	0x36, 0x0f, 0x54, 0x81, 0x0a, 0x4b, 0x51, 0xba, 0x1f, 0x77, 0xed, 0xc8, 0x87, 0x09, 0x1a, 0xd2,
+	0x60, 0x25, 0x5a, 0x6b, 0x24, 0xe8, 0x55, 0x41, 0x1d, 0xe4, 0x1b, 0xb7, 0x24, 0xe1, 0x8d, 0x78,
+	0x76, 0x68, 0x87, 0x30, 0x97, 0x5a, 0x4c, 0x1b, 0x14, 0x47, 0xff, 0x82, 0x59, 0x4e, 0x89, 0x23,
+	0xbc, 0x56, 0x6c, 0x5c, 0x92, 0xc0, 0x1c, 0x53, 0xe2, 0x68, 0x82, 0x29, 0x8a, 0x5a, 0xae, 0x1f,
+	0xb5, 0x32, 0xcc, 0x1b, 0xc4, 0xa5, 0x0e, 0x31, 0x42, 0xa7, 0x45, 0x4b, 0x7f, 0x47, 0xf7, 0x1c,
+	0x87, 0x30, 0x1e, 0xba, 0x28, 0x5a, 0x46, 0x91, 0x5e, 0xe8, 0x47, 0xda, 0x6f, 0x01, 0xee, 0x0b,
+	0x31, 0x41, 0x76, 0x19, 0x6e, 0x9a, 0xc4, 0x28, 0x2f, 0x56, 0x95, 0xda, 0x82, 0x96, 0x26, 0xa3,
+	0x3a, 0x20, 0xea, 0x1e, 0x13, 0xa7, 0x43, 0x19, 0xe6, 0x24, 0x62, 0x06, 0xc1, 0x2c, 0xd9, 0x41,
+	0x7b, 0x50, 0xc0, 0xf1, 0xc4, 0x2b, 0xe7, 0x85, 0xbb, 0xaa, 0xb2, 0x6a, 0x88, 0xf3, 0x69, 0x49,
+	0x31, 0xf4, 0x76, 0xb0, 0x81, 0x2c, 0x09, 0xa4, 0xad, 0xa9, 0x9a, 0xa9, 0xac, 0x8b, 0x48, 0x66,
+	0x6a, 0x41, 0x3a, 0x53, 0xd1, 0x49, 0xa2, 0xae, 0x8b, 0xa2, 0xae, 0xff, 0x33, 0xae, 0xae, 0x85,
+	0x11, 0x1f, 0xb3, 0xb8, 0x7f, 0x99, 0x83, 0x92, 0xd0, 0xf8, 0xb4, 0x8d, 0x59, 0x8b, 0xec, 0x9e,
+	0xfb, 0x31, 0x3e, 0x83, 0xd5, 0x44, 0xf7, 0x3e, 0xb1, 0x8d, 0x68, 0x00, 0xe5, 0x1b, 0xff, 0x1d,
+	0x66, 0x73, 0x0c, 0x21, 0xe9, 0xc4, 0x40, 0x7c, 0x3f, 0xa3, 0xc9, 0x50, 0x11, 0x83, 0xb5, 0x04,
+	0x59, 0x23, 0x1d, 0xeb, 0x9c, 0x04, 0x63, 0x24, 0xdf, 0x78, 0x30, 0xb5, 0xb6, 0x50, 0x7e, 0x3f,
+	0xa3, 0x49, 0x71, 0xd1, 0x29, 0xac, 0xe2, 0xb8, 0x8b, 0xc3, 0xc3, 0x05, 0x95, 0xd8, 0x98, 0x46,
+	0x5d, 0xff, 0x5c, 0x12, 0x40, 0x44, 0x61, 0x2d, 0x41, 0x8e, 0xce, 0x35, 0x2b, 0x14, 0xdd, 0x9d,
+	0x46, 0x51, 0xec, 0x48, 0x32, 0x48, 0x74, 0x04, 0x79, 0x97, 0x61, 0xdb, 0x6d, 0x5b, 0x7c, 0x97,
+	0x19, 0xe1, 0x70, 0xdc, 0x9a, 0x44, 0xc3, 0x51, 0x5f, 0x6c, 0x3f, 0xa3, 0xc5, 0x51, 0x2a, 0x4d,
+	0x58, 0x95, 0x44, 0x11, 0x3d, 0x87, 0x42, 0xc2, 0xad, 0x61, 0x56, 0xfc, 0x63, 0xa2, 0x4c, 0xd6,
+	0x92, 0xb2, 0x95, 0xc7, 0xb0, 0x26, 0x8b, 0x9d, 0xec, 0x56, 0xa1, 0x48, 0x6f, 0x15, 0x95, 0x57,
+	0x50, 0x4c, 0xf9, 0xfd, 0x7f, 0xb0, 0x10, 0x31, 0x85, 0xb6, 0x55, 0xc7, 0xd9, 0xa6, 0xf5, 0x24,
+	0x2a, 0xff, 0x86, 0xe5, 0xb4, 0x77, 0xaf, 0x01, 0x44, 0xdb, 0x3d, 0x3b, 0x62, 0x94, 0x4a, 0x01,
+	0xf2, 0x31, 0x37, 0x3e, 0x99, 0x87, 0x9c, 0xf0, 0xad, 0xfa, 0x87, 0x02, 0x20, 0xd4, 0xbc, 0xf1,
+	0x88, 0xd3, 0xf5, 0x7b, 0xb5, 0x8d, 0x5b, 0x91, 0x4d, 0xb2, 0x5e, 0x7d, 0x88, 0x5b, 0x44, 0x13,
+	0x4c, 0xa8, 0x09, 0x2b, 0xa7, 0xd4, 0xe4, 0xc4, 0xa1, 0xac, 0xf5, 0xd4, 0xa1, 0xfe, 0x1f, 0x5c,
+	0xce, 0x8a, 0x9e, 0x71, 0x6f, 0xd8, 0x69, 0x84, 0x9a, 0xfa, 0x5e, 0x5a, 0x2c, 0x68, 0x19, 0x83,
+	0x70, 0xfe, 0x95, 0xf0, 0x94, 0x12, 0xd3, 0x08, 0xae, 0xad, 0x8b, 0x5a, 0xb8, 0xaa, 0xec, 0xc0,
+	0x86, 0x1c, 0x64, 0xaa, 0xc6, 0xb2, 0x06, 0xd9, 0x03, 0x23, 0x3d, 0x28, 0x55, 0x06, 0xab, 0x83,
+	0x59, 0xe1, 0xa2, 0xcf, 0x52, 0x35, 0x19, 0x90, 0xcb, 0x8a, 0x38, 0xf0, 0x84, 0xa9, 0x25, 0x43,
+	0x50, 0xdf, 0x41, 0x31, 0xc1, 0xea, 0xa2, 0x7d, 0x28, 0x26, 0x18, 0x23, 0x2d, 0xe3, 0x93, 0x24,
+	0x25, 0xa7, 0xea, 0x00, 0xfe, 0x74, 0x0d, 0xd3, 0x6e, 0xe2, 0x94, 0xed, 0x0d, 0xed, 0xec, 0x04,
+	0x43, 0x5b, 0xfd, 0x56, 0x81, 0xf5, 0x68, 0xb6, 0x51, 0xd6, 0xf2, 0xc7, 0xd9, 0xd4, 0x0a, 0x07,
+	0xc6, 0x68, 0xf6, 0x2f, 0x8d, 0x51, 0xf5, 0x27, 0x05, 0x6e, 0x8c, 0x78, 0x6a, 0x4c, 0x6d, 0xd7,
+	0xa7, 0x50, 0x4c, 0x8c, 0xd3, 0xe8, 0xc1, 0x36, 0xed, 0x13, 0x27, 0x85, 0x32, 0xec, 0x25, 0xa7,
+	0xfe, 0xa6, 0xc0, 0xd5, 0x04, 0x4e, 0x7f, 0x70, 0x4e, 0x6d, 0xfb, 0x97, 0x89, 0x69, 0x1e, 0x54,
+	0xe6, 0xe3, 0x71, 0x76, 0xa7, 0xf5, 0x7d, 0xcc, 0xc1, 0xfe, 0x83, 0x02, 0x97, 0xa5, 0x0f, 0xf1,
+	0xfe, 0x51, 0x13, 0xf9, 0xdc, 0x3f, 0x6a, 0x8a, 0x8c, 0x5e, 0x41, 0x21, 0xfe, 0xce, 0x89, 0xa2,
+	0x34, 0xf9, 0xcb, 0x3f, 0x29, 0x3e, 0x2c, 0x3c, 0x9b, 0x6f, 0xfb, 0xdf, 0x1c, 0x92, 0x01, 0x46,
+	0x08, 0x8a, 0x47, 0x1c, 0x3b, 0xfc, 0x80, 0x51, 0x4e, 0x31, 0x27, 0x46, 0x29, 0x83, 0xf2, 0x30,
+	0x2f, 0x68, 0xc4, 0x28, 0x29, 0x68, 0x05, 0x0a, 0xcf, 0xa9, 0x69, 0xf6, 0xf7, 0xb3, 0xc1, 0xbe,
+	0x65, 0xdb, 0xc4, 0x28, 0xcd, 0x6c, 0x3e, 0x84, 0x75, 0xa9, 0x69, 0xa8, 0x04, 0x4b, 0xaf, 0x2c,
+	0x1e, 0xd1, 0x58, 0x29, 0x83, 0x96, 0x21, 0xff, 0xc6, 0xc3, 0x0e, 0x66, 0x9c, 0x32, 0x1f, 0x7b,
+	0xf3, 0x3e, 0xe4, 0x63, 0x5f, 0x0b, 0x7c, 0xdc, 0x13, 0x76, 0xc6, 0xac, 0x0f, 0x2c, 0x30, 0x22,
+	0xd8, 0xeb, 0x96, 0x14, 0x54, 0x80, 0xc5, 0x13, 0xd6, 0x0e, 0x97, 0xd9, 0xcd, 0x93, 0xbe, 0xff,
+	0x25, 0x49, 0x8b, 0x96, 0x60, 0xe1, 0x80, 0x61, 0x9d, 0xd3, 0x73, 0x52, 0xca, 0x20, 0x80, 0xb9,
+	0xed, 0xe0, 0xbf, 0xc0, 0x39, 0x6c, 0x63, 0x97, 0x18, 0xaf, 0x3d, 0x5e, 0xca, 0xfa, 0x4b, 0x31,
+	0x89, 0xfc, 0x2b, 0x71, 0x69, 0xa6, 0xf1, 0xe3, 0x3c, 0x6c, 0x88, 0xbe, 0xf4, 0x12, 0x33, 0xdc,
+	0x22, 0x1d, 0xc2, 0xf8, 0x11, 0x71, 0xce, 0xa9, 0x4e, 0xd0, 0x09, 0xac, 0x3c, 0x23, 0xe9, 0xd6,
+	0xba, 0x51, 0x0f, 0xbe, 0x47, 0xd5, 0xa3, 0xef, 0x51, 0xf5, 0xdd, 0x8e, 0xcd, 0xbb, 0x95, 0x7f,
+	0x4e, 0xd4, 0x55, 0x5d, 0x35, 0x83, 0x34, 0x28, 0xa5, 0x61, 0xd1, 0xba, 0x2c, 0xf8, 0x46, 0x65,
+	0xb2, 0x56, 0xad, 0x66, 0xd0, 0x4b, 0x81, 0x99, 0xfc, 0xb4, 0x30, 0x04, 0x73, 0x6c, 0x63, 0x56,
+	0x33, 0xe8, 0x73, 0x40, 0x7b, 0x94, 0x19, 0xa9, 0x56, 0x7f, 0x75, 0xe4, 0xa4, 0xac, 0xdc, 0x18,
+	0x07, 0x1c, 0x1c, 0xfe, 0x52, 0x50, 0x30, 0x89, 0x13, 0xf8, 0x0d, 0x5a, 0x0a, 0xdf, 0x1f, 0x08,
+	0x95, 0x21, 0x8e, 0x57, 0x33, 0xe8, 0x0b, 0x58, 0x0f, 0x78, 0x52, 0x8d, 0x1d, 0xd5, 0x46, 0x74,
+	0xe4, 0x44, 0xf3, 0x1f, 0x01, 0xee, 0xc2, 0x0d, 0x89, 0xc1, 0xa9, 0xe4, 0xbb, 0x37, 0x5d, 0x87,
+	0x1d, 0xab, 0xf4, 0x0c, 0xae, 0x4a, 0x94, 0xf6, 0xdb, 0x17, 0xba, 0x33, 0x6d, 0x6b, 0x1c, 0xa1,
+	0xac, 0x05, 0x97, 0x93, 0xca, 0x92, 0x25, 0x5d, 0x9f, 0xb4, 0x2f, 0x8d, 0x55, 0x74, 0x08, 0x85,
+	0xd7, 0x4d, 0x97, 0x38, 0xe7, 0x44, 0xa4, 0xc5, 0xf0, 0x5a, 0xba, 0x39, 0xc1, 0x55, 0x5b, 0xcd,
+	0xdc, 0x51, 0x9e, 0xdc, 0x87, 0xeb, 0x83, 0x9c, 0x2d, 0xc7, 0xd6, 0x03, 0xc4, 0x16, 0x61, 0x4f,
+	0x82, 0x2b, 0xe3, 0xa1, 0xbf, 0x3c, 0x54, 0xde, 0xe5, 0x04, 0x4b, 0x73, 0x4e, 0x6c, 0xdf, 0xfd,
+	0x33, 0x00, 0x00, 0xff, 0xff, 0xae, 0xaa, 0xf9, 0x0e, 0x94, 0x16, 0x00, 0x00,
 }
diff --git a/api/netflix/titus/titus_base.pb.go b/api/netflix/titus/titus_base.pb.go
index 3e5f609ca..925a09d56 100644
--- a/api/netflix/titus/titus_base.pb.go
+++ b/api/netflix/titus/titus_base.pb.go
@@ -10,7 +10,7 @@ It is generated from these files:
 	netflix/titus/agent.proto
 
 It has these top-level messages:
-	UserIdentity
+	CallMetadata
 	Page
 	Pagination
 	RetryPolicy
@@ -30,6 +30,7 @@ It has these top-level messages:
 	TierUpdate
 	AutoScalingRuleUpdate
 	InstanceGroupLifecycleStateUpdate
+	InstanceGroupAttributesUpdate
 	InstanceOverrideStateUpdate
 	TaskStatusData
 	StateUpdate
@@ -107,38 +108,53 @@ func (x MountPerm) String() string {
 }
 func (MountPerm) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
-// / Caller's identity, and their security context.
-type UserIdentity struct {
-	// / (Required) A unique user identifier. Depending on user type (a person or an application), the format
-	// of the id may be different. For example a person's id could be encoded as 'person:<email-address>', and
+// / Call metadata (caller's identity, call path).
+type CallMetadata struct {
+	// / (Required) The original caller identifier. Depending on the user identity (a user or an application), the format
+	// of the id may be different. For example a user's id could be encoded as 'user:<email-address>', and
 	// application id as 'app:<aws-account-id>:<app-name>:<app-stack>'.
-	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
-	// / (Optional) Security context data associated with the user (for example user roles). The following names are
-	// reserved, and should be used if applicable:
-	// * name - caller's name
-	// * email - caller's email address
-	SecurityContext map[string]string `protobuf:"bytes,2,rep,name=securityContext" json:"securityContext,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	CallerId string `protobuf:"bytes,1,opt,name=callerId" json:"callerId,omitempty"`
+	// / (Optional) The reason why a call was made.
+	CallReason string `protobuf:"bytes,2,opt,name=callReason" json:"callReason,omitempty"`
+	// / (Optional) The list of intermediaries via which a call was relayed.
+	CallPath []string `protobuf:"bytes,3,rep,name=callPath" json:"callPath,omitempty"`
+	// / (Optional) If set to true, a diagnostic information is provided if a request fails.
+	Debug bool `protobuf:"varint,4,opt,name=debug" json:"debug,omitempty"`
 }
 
-func (m *UserIdentity) Reset()                    { *m = UserIdentity{} }
-func (m *UserIdentity) String() string            { return proto.CompactTextString(m) }
-func (*UserIdentity) ProtoMessage()               {}
-func (*UserIdentity) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (m *CallMetadata) Reset()                    { *m = CallMetadata{} }
+func (m *CallMetadata) String() string            { return proto.CompactTextString(m) }
+func (*CallMetadata) ProtoMessage()               {}
+func (*CallMetadata) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
-func (m *UserIdentity) GetId() string {
+func (m *CallMetadata) GetCallerId() string {
 	if m != nil {
-		return m.Id
+		return m.CallerId
 	}
 	return ""
 }
 
-func (m *UserIdentity) GetSecurityContext() map[string]string {
+func (m *CallMetadata) GetCallReason() string {
 	if m != nil {
-		return m.SecurityContext
+		return m.CallReason
+	}
+	return ""
+}
+
+func (m *CallMetadata) GetCallPath() []string {
+	if m != nil {
+		return m.CallPath
 	}
 	return nil
 }
 
+func (m *CallMetadata) GetDebug() bool {
+	if m != nil {
+		return m.Debug
+	}
+	return false
+}
+
 // / An entity representing single page of a collection. Either pageNumber or cursor must be set on requests.
 type Page struct {
 	// / (Optional) Requested page number, starting from 0 (defaults to 0 if not specified).
@@ -541,7 +557,7 @@ func (m *ResourceDimension) GetNetworkMbps() uint32 {
 }
 
 func init() {
-	proto.RegisterType((*UserIdentity)(nil), "com.netflix.titus.UserIdentity")
+	proto.RegisterType((*CallMetadata)(nil), "com.netflix.titus.CallMetadata")
 	proto.RegisterType((*Page)(nil), "com.netflix.titus.Page")
 	proto.RegisterType((*Pagination)(nil), "com.netflix.titus.Pagination")
 	proto.RegisterType((*RetryPolicy)(nil), "com.netflix.titus.RetryPolicy")
@@ -556,48 +572,46 @@ func init() {
 func init() { proto.RegisterFile("netflix/titus/titus_base.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 687 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x54, 0xdd, 0x6e, 0xe2, 0x46,
-	0x14, 0xc6, 0xe6, 0x27, 0x70, 0x08, 0x29, 0x19, 0x45, 0x2d, 0xe5, 0x22, 0x8d, 0xa8, 0x1a, 0x45,
-	0xb9, 0x70, 0x54, 0xda, 0x4a, 0x6d, 0x2f, 0x9d, 0xa4, 0x82, 0x0b, 0x1a, 0x34, 0x49, 0x15, 0x29,
-	0x17, 0x5d, 0x0d, 0xf6, 0xc1, 0x3b, 0xc2, 0xf6, 0xa0, 0xf1, 0x38, 0x8b, 0xf7, 0x01, 0xf6, 0x6e,
-	0x1f, 0x62, 0x5f, 0x65, 0xdf, 0x64, 0xdf, 0x64, 0x35, 0x63, 0xc3, 0x3a, 0x81, 0x55, 0xf6, 0x06,
-	0xe6, 0xfb, 0xce, 0x77, 0xbe, 0xef, 0xcc, 0x30, 0x03, 0x1c, 0xc7, 0xa8, 0xe6, 0x21, 0x5f, 0x5d,
-	0x28, 0xae, 0xd2, 0x24, 0xff, 0x7c, 0x35, 0x63, 0x09, 0x3a, 0x4b, 0x29, 0x94, 0x20, 0x87, 0x9e,
-	0x88, 0x9c, 0x42, 0xe3, 0x98, 0x6a, 0xff, 0xc7, 0x40, 0x88, 0x20, 0xc4, 0x0b, 0x23, 0x98, 0xa5,
-	0xf3, 0x0b, 0x16, 0x67, 0xb9, 0x7a, 0xf0, 0xd1, 0x82, 0xfd, 0xff, 0x12, 0x94, 0x63, 0x1f, 0x63,
-	0xc5, 0x55, 0x46, 0x0e, 0xc0, 0xe6, 0x7e, 0xcf, 0x3a, 0xb1, 0xce, 0x5a, 0xd4, 0xe6, 0x3e, 0xf9,
-	0x1f, 0xbe, 0x4b, 0xd0, 0x4b, 0x25, 0x57, 0xd9, 0xa5, 0x88, 0x15, 0xae, 0x54, 0xcf, 0x3e, 0xa9,
-	0x9e, 0xb5, 0x87, 0xbf, 0x3b, 0x5b, 0x41, 0x4e, 0xd9, 0xc9, 0xb9, 0x7d, 0xda, 0x76, 0x1d, 0x2b,
-	0x99, 0xd1, 0xe7, 0x66, 0x7d, 0x17, 0x8e, 0x76, 0x09, 0x49, 0x17, 0xaa, 0x0b, 0xcc, 0x8a, 0x41,
-	0xf4, 0x92, 0x1c, 0x41, 0xfd, 0x91, 0x85, 0x29, 0xf6, 0x6c, 0xc3, 0xe5, 0xe0, 0x6f, 0xfb, 0x4f,
-	0x6b, 0xf0, 0x00, 0xb5, 0x29, 0x0b, 0x90, 0x1c, 0x03, 0x2c, 0x59, 0x80, 0xff, 0xa6, 0xd1, 0x0c,
-	0xa5, 0x69, 0xad, 0xd3, 0x12, 0x43, 0xfa, 0xd0, 0xd4, 0xe8, 0x96, 0xbf, 0xcd, 0x4d, 0xea, 0x74,
-	0x83, 0xc9, 0xf7, 0xd0, 0xf0, 0x52, 0x99, 0x08, 0xd9, 0xab, 0x1a, 0xfb, 0x02, 0x0d, 0x3e, 0x59,
-	0x00, 0x53, 0x16, 0xf0, 0x98, 0x29, 0x2e, 0x62, 0xf2, 0x17, 0xb4, 0xbd, 0x54, 0x4a, 0x8c, 0x95,
-	0x4e, 0x34, 0x19, 0xed, 0xe1, 0x0f, 0x3b, 0x8e, 0x42, 0x97, 0x69, 0x59, 0x4b, 0x7a, 0xb0, 0xf7,
-	0x9a, 0x25, 0x13, 0x21, 0xf3, 0xf0, 0x26, 0x5d, 0x43, 0x3d, 0xb7, 0x12, 0x8a, 0x85, 0x5a, 0x96,
-	0x98, 0xfc, 0x3a, 0x2d, 0x31, 0x9b, 0xfa, 0x58, 0x61, 0x94, 0xf4, 0x6a, 0xa5, 0xba, 0x61, 0x4a,
-	0xb3, 0xd7, 0xcb, 0xb3, 0x93, 0x53, 0x38, 0xc8, 0x57, 0x53, 0x91, 0x70, 0x3d, 0x7e, 0xaf, 0x61,
-	0x7a, 0x9f, 0xb1, 0x83, 0x0f, 0x35, 0x68, 0x53, 0x54, 0x32, 0x9b, 0x8a, 0x90, 0x7b, 0x19, 0x19,
-	0x41, 0x8b, 0x47, 0x11, 0xfa, 0x9c, 0xa9, 0xf5, 0x16, 0xcf, 0x76, 0x6c, 0xb1, 0xd4, 0xe2, 0x8c,
-	0xd7, 0xfa, 0x51, 0x85, 0x7e, 0x69, 0x26, 0x2e, 0xec, 0xf9, 0x18, 0xb2, 0x0c, 0x7d, 0xb3, 0xe7,
-	0xf6, 0xf0, 0xf4, 0x05, 0x9f, 0xab, 0x5c, 0x3d, 0xaa, 0xd0, 0x75, 0x23, 0xf1, 0x80, 0xe0, 0x6a,
-	0x29, 0x62, 0x7d, 0xad, 0x58, 0xe8, 0x32, 0x6f, 0x71, 0x33, 0x9f, 0x9b, 0x53, 0x6a, 0x0f, 0x7f,
-	0x7d, 0xc1, 0xee, 0x7a, 0xab, 0x71, 0x54, 0xa1, 0x3b, 0xec, 0xfa, 0xbf, 0x40, 0x6b, 0xb3, 0x05,
-	0xfd, 0x4b, 0x49, 0x54, 0x92, 0x63, 0x62, 0x76, 0xdf, 0xa1, 0x6b, 0xd8, 0x47, 0xd8, 0x2b, 0x26,
-	0xd4, 0x87, 0xcb, 0x63, 0xae, 0x3d, 0x0c, 0x33, 0xc9, 0xb5, 0x35, 0xfa, 0x8c, 0xd5, 0x66, 0x7e,
-	0x21, 0xb0, 0x8d, 0x60, 0x0d, 0xcb, 0x31, 0xd5, 0xa7, 0x31, 0xef, 0x2c, 0x20, 0xdb, 0xa3, 0x7f,
-	0x73, 0xa4, 0x03, 0x24, 0x62, 0x2b, 0x83, 0xc6, 0xb1, 0x42, 0xf9, 0xc8, 0xc2, 0x4d, 0xfa, 0x8e,
-	0xca, 0xd7, 0x07, 0x71, 0x9b, 0xd0, 0xc8, 0x4f, 0x72, 0xf0, 0xde, 0x82, 0x43, 0x8a, 0x89, 0x48,
-	0xa5, 0x87, 0x57, 0x3c, 0xc2, 0x38, 0xd1, 0xcf, 0xa1, 0x0b, 0x55, 0x6f, 0x99, 0x16, 0xa7, 0xa4,
-	0x97, 0x9a, 0x09, 0x96, 0xa9, 0x09, 0xeb, 0x50, 0xbd, 0xd4, 0xaf, 0x2e, 0xc2, 0x48, 0xc8, 0x6c,
-	0xe2, 0x16, 0xf6, 0x1b, 0xac, 0x6f, 0xae, 0xcf, 0x93, 0xc5, 0xc4, 0x35, 0xb7, 0xba, 0x43, 0x0b,
-	0x44, 0x4e, 0xa0, 0x1d, 0xa3, 0x7a, 0x23, 0xe4, 0x62, 0x32, 0x5b, 0x26, 0xe6, 0x5a, 0x77, 0x68,
-	0x99, 0x3a, 0x3f, 0x86, 0xda, 0x1d, 0x47, 0x49, 0x9a, 0x50, 0xfb, 0x27, 0xc4, 0x55, 0xb7, 0x42,
-	0xf6, 0xa1, 0x79, 0x29, 0xb9, 0xe2, 0x1e, 0x0b, 0xbb, 0xd6, 0xf9, 0xcf, 0xd0, 0x9a, 0x88, 0x34,
-	0x56, 0x53, 0x94, 0x11, 0x69, 0x80, 0x4d, 0x6f, 0xba, 0x15, 0xfd, 0x7d, 0x7f, 0xd3, 0xb5, 0x0c,
-	0xbe, 0xef, 0xda, 0xee, 0x1f, 0xf0, 0xd3, 0xf6, 0xfd, 0x09, 0xe4, 0xd2, 0xcb, 0xff, 0x1d, 0x03,
-	0x8c, 0xdd, 0xd6, 0x9d, 0x26, 0x5d, 0x96, 0xe0, 0xd4, 0x7a, 0xa8, 0x1b, 0xc5, 0xac, 0x61, 0xaa,
-	0xbf, 0x7d, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x74, 0xc8, 0x89, 0x8b, 0x05, 0x00, 0x00,
+	// 655 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x54, 0xcf, 0x6f, 0x1a, 0x3b,
+	0x10, 0x66, 0xf9, 0x15, 0x18, 0xc2, 0x13, 0xb1, 0x9e, 0xde, 0xa3, 0x1c, 0x52, 0x44, 0xd5, 0x28,
+	0xca, 0x81, 0xa8, 0xa9, 0x7a, 0xe8, 0x75, 0x93, 0x56, 0x70, 0xa0, 0x41, 0x6e, 0xa4, 0x48, 0xb9,
+	0x54, 0x66, 0x77, 0xd8, 0x58, 0xd9, 0xb5, 0x91, 0xed, 0x6d, 0xa1, 0xea, 0xb9, 0xb7, 0xfe, 0x11,
+	0xfd, 0xd3, 0xfa, 0x9f, 0x54, 0xf6, 0xee, 0xd2, 0x6d, 0x48, 0x95, 0x5e, 0xc0, 0xdf, 0x37, 0xdf,
+	0xcc, 0x37, 0x33, 0xd8, 0xc0, 0xa1, 0x40, 0xb3, 0x8c, 0xf9, 0xfa, 0xd4, 0x70, 0x93, 0xea, 0xec,
+	0xf3, 0xc3, 0x82, 0x69, 0x1c, 0xaf, 0x94, 0x34, 0x92, 0x1c, 0x04, 0x32, 0x19, 0xe7, 0x9a, 0xb1,
+	0x8b, 0x0e, 0x9e, 0x44, 0x52, 0x46, 0x31, 0x9e, 0x3a, 0xc1, 0x22, 0x5d, 0x9e, 0x32, 0xb1, 0xc9,
+	0xd4, 0xa3, 0x2f, 0xb0, 0x7f, 0xce, 0xe2, 0x78, 0x86, 0x86, 0x85, 0xcc, 0x30, 0x32, 0x80, 0x56,
+	0xc0, 0xe2, 0x18, 0xd5, 0x34, 0xec, 0x7b, 0x43, 0xef, 0xb8, 0x4d, 0xb7, 0x98, 0x1c, 0x02, 0xd8,
+	0x33, 0x45, 0xa6, 0xa5, 0xe8, 0x57, 0x5d, 0xb4, 0xc4, 0x14, 0xb9, 0x73, 0x66, 0x6e, 0xfb, 0xb5,
+	0x61, 0xad, 0xc8, 0xb5, 0x98, 0xfc, 0x0b, 0x8d, 0x10, 0x17, 0x69, 0xd4, 0xaf, 0x0f, 0xbd, 0xe3,
+	0x16, 0xcd, 0xc0, 0xe8, 0x06, 0xea, 0x73, 0x16, 0xa1, 0xad, 0xbc, 0x62, 0x11, 0xbe, 0x4b, 0x93,
+	0x05, 0x2a, 0xe7, 0xdb, 0xa0, 0x25, 0xc6, 0x56, 0xb6, 0xe8, 0x3d, 0xff, 0x8c, 0xce, 0xb7, 0x41,
+	0xb7, 0x98, 0xfc, 0x07, 0xcd, 0x20, 0x55, 0x5a, 0xaa, 0x7e, 0xcd, 0x75, 0x94, 0xa3, 0xd1, 0x0f,
+	0x0f, 0x60, 0xce, 0x22, 0x2e, 0x98, 0xe1, 0x52, 0x90, 0xd7, 0xd0, 0x09, 0x52, 0xa5, 0x50, 0x18,
+	0xeb, 0xe8, 0x3c, 0x3a, 0x67, 0xff, 0x8f, 0x77, 0x96, 0x35, 0xb6, 0x61, 0x5a, 0xd6, 0x92, 0x3e,
+	0xec, 0xdd, 0x32, 0x3d, 0x93, 0x2a, 0x33, 0x6f, 0xd1, 0x02, 0xda, 0xbe, 0x8d, 0x34, 0x2c, 0xb6,
+	0x32, 0xed, 0xfc, 0x1b, 0xb4, 0xc4, 0x6c, 0xe3, 0x53, 0x83, 0x89, 0x76, 0xa3, 0x17, 0x71, 0xc7,
+	0x94, 0x7a, 0x6f, 0x94, 0x7b, 0x27, 0x47, 0xf0, 0x4f, 0x76, 0x9a, 0x4b, 0xcd, 0x6d, 0xfb, 0xfd,
+	0xa6, 0xcb, 0xbd, 0xc7, 0x8e, 0xbe, 0xd7, 0xa1, 0x43, 0xd1, 0xa8, 0xcd, 0x5c, 0xc6, 0x3c, 0xd8,
+	0x90, 0x09, 0xb4, 0x79, 0x92, 0x60, 0xc8, 0x99, 0x29, 0x46, 0x3c, 0x7e, 0x60, 0xc4, 0x52, 0xca,
+	0x78, 0x5a, 0xe8, 0x27, 0x15, 0xfa, 0x2b, 0x99, 0xf8, 0xb0, 0x17, 0x62, 0xcc, 0x36, 0x18, 0xba,
+	0x99, 0x3b, 0x67, 0x47, 0x8f, 0xd4, 0xb9, 0xc8, 0xd4, 0x93, 0x0a, 0x2d, 0x12, 0x49, 0x00, 0x04,
+	0xd7, 0x2b, 0x29, 0x50, 0x18, 0xce, 0x62, 0x9f, 0x05, 0x77, 0x97, 0xcb, 0xa5, 0xdb, 0x52, 0xe7,
+	0xec, 0xc5, 0x23, 0xe5, 0xde, 0xec, 0x24, 0x4e, 0x2a, 0xf4, 0x81, 0x72, 0x83, 0xe7, 0xd0, 0xde,
+	0x8e, 0x60, 0x7f, 0x29, 0x85, 0x46, 0x71, 0xd4, 0x6e, 0xfa, 0x2e, 0x2d, 0xe0, 0x00, 0x61, 0x2f,
+	0xef, 0xd0, 0x2e, 0x97, 0x0b, 0x6e, 0x6b, 0x38, 0x66, 0x96, 0x69, 0xeb, 0xf4, 0x1e, 0x6b, 0x8b,
+	0x85, 0xb9, 0xa0, 0xea, 0x04, 0x05, 0x2c, 0xdb, 0xd4, 0x7e, 0xb7, 0xf9, 0xea, 0x01, 0xd9, 0x6d,
+	0xfd, 0xaf, 0x2d, 0xc7, 0x40, 0x12, 0xb6, 0x76, 0x68, 0x2a, 0x0c, 0xaa, 0x8f, 0x2c, 0xde, 0xba,
+	0x3f, 0x10, 0xf9, 0x73, 0x23, 0x7e, 0x0b, 0x9a, 0xd9, 0x26, 0x47, 0xdf, 0x3c, 0x38, 0xa0, 0xa8,
+	0x65, 0xaa, 0x02, 0xbc, 0xe0, 0x09, 0x0a, 0x6d, 0x9f, 0x43, 0x0f, 0x6a, 0xc1, 0x2a, 0xcd, 0xb7,
+	0x64, 0x8f, 0x96, 0x89, 0x56, 0xa9, 0x33, 0xeb, 0x52, 0x7b, 0xb4, 0xaf, 0x2e, 0xc1, 0x44, 0xaa,
+	0xcd, 0xcc, 0xcf, 0xcb, 0x6f, 0xb1, 0xbd, 0xb9, 0x21, 0xd7, 0x77, 0x33, 0xdf, 0xdd, 0xea, 0x2e,
+	0xcd, 0x11, 0x19, 0x42, 0x47, 0xa0, 0xf9, 0x24, 0xd5, 0xdd, 0x6c, 0xb1, 0xd2, 0xee, 0x5a, 0x77,
+	0x69, 0x99, 0x3a, 0x39, 0x84, 0xfa, 0x15, 0x47, 0x45, 0x5a, 0x50, 0x7f, 0x1b, 0xe3, 0xba, 0x57,
+	0x21, 0xfb, 0xd0, 0x3a, 0x57, 0xdc, 0xf0, 0x80, 0xc5, 0x3d, 0xef, 0xe4, 0x19, 0xb4, 0x67, 0x32,
+	0x15, 0x66, 0x8e, 0x2a, 0x21, 0x4d, 0xa8, 0xd2, 0xcb, 0x5e, 0xc5, 0x7e, 0x5f, 0x5f, 0xf6, 0x3c,
+	0x87, 0xaf, 0x7b, 0x55, 0xff, 0x15, 0x3c, 0xdd, 0xbd, 0x3f, 0x91, 0x5a, 0x05, 0xd9, 0xdf, 0x5a,
+	0x84, 0xc2, 0x6f, 0x5f, 0x59, 0xd2, 0x67, 0x1a, 0xe7, 0xde, 0x4d, 0xc3, 0x29, 0x16, 0x4d, 0x17,
+	0x7d, 0xf9, 0x33, 0x00, 0x00, 0xff, 0xff, 0x58, 0x94, 0x86, 0x39, 0x44, 0x05, 0x00, 0x00,
 }
diff --git a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/agent.proto b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/agent.proto
index 1e1c18afb..ae0d07c0e 100644
--- a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/agent.proto
+++ b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/agent.proto
@@ -73,9 +73,9 @@ message ContainerInfo {
 
     optional string logUploadRegexp = 7;
 
-    optional uint32 maxHealthFailures = 8;
+    optional uint32 maxHealthFailures = 8 [deprecated = true];
 
-    repeated string healthCheckCmd = 9;
+    repeated string healthCheckCmd = 9 [deprecated = true];
 
     enum SnapshotPolicy {
         NEVER = 0;
@@ -84,12 +84,10 @@ message ContainerInfo {
         ALWAYS = 3;
     }
 
-    optional SnapshotPolicy snapshotPolicy = 10;
+    optional SnapshotPolicy snapshotPolicy = 10 [deprecated = true];
 
     repeated string entrypointCmd = 11; // Deprecated. Use entrypointStr instead.
 
-    optional bool allocateIpAddress = 12 [default = false];
-
     optional string entrypointStr = 13;
 
     optional string appName = 14;
@@ -101,11 +99,9 @@ message ContainerInfo {
     optional string iamProfile = 17;
 
     message NetworkConfigInfo {
-        // deprecated: use eniLabel instead
-        required string eniLablel = 1 [deprecated = true];
-        // this should be required, but it was added later (typo fix) and is optional for backwards compatibility
+        // should this be required?
+        // it was added later (typo fix)
         optional string eniLabel = 5;
-        optional bool allocateIpAddress = 2 [default = false];
         repeated string securityGroups = 3;
         optional uint32 bandwidthLimitMbps = 4; // In Mbps
     }
@@ -114,6 +110,7 @@ message ContainerInfo {
 
     optional string jobGroupSequence = 19;
 
+    // TODO(Sargun): Remove, and use the Mesos resource info instead
     optional uint32 numGpus = 20;
 
     message EfsConfigInfo {
diff --git a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_base.proto b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_base.proto
index df1b98d7e..ab33c1fdc 100644
--- a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_base.proto
+++ b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_base.proto
@@ -13,18 +13,21 @@ option go_package = "titus";
 // ----------------------------------------------------------------------------
 // Supplementary data structures
 
-/// Caller's identity, and their security context.
-message UserIdentity {
-    /// (Required) A unique user identifier. Depending on user type (a person or an application), the format
-    // of the id may be different. For example a person's id could be encoded as 'person:<email-address>', and
+/// Call metadata (caller's identity, call path).
+message CallMetadata {
+    /// (Required) The original caller identifier. Depending on the user identity (a user or an application), the format
+    // of the id may be different. For example a user's id could be encoded as 'user:<email-address>', and
     // application id as 'app:<aws-account-id>:<app-name>:<app-stack>'.
-    string id = 1;
+    string callerId = 1;
 
-    /// (Optional) Security context data associated with the user (for example user roles). The following names are
-    // reserved, and should be used if applicable:
-    // * name - caller's name
-    // * email - caller's email address
-    map<string, string> securityContext = 2;
+    /// (Optional) The reason why a call was made.
+    string callReason = 2;
+
+    /// (Optional) The list of intermediaries via which a call was relayed.
+    repeated string callPath = 3;
+
+    /// (Optional) If set to true, a diagnostic information is provided if a request fails.
+    bool debug = 4;
 }
 
 /// An entity representing single page of a collection. Either pageNumber or cursor must be set on requests.
diff --git a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_job_api.proto b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_job_api.proto
index 92daf50c8..d883234a7 100644
--- a/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_job_api.proto
+++ b/vendor/github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus/titus_job_api.proto
@@ -18,10 +18,9 @@ option go_package = "titus";
 // ----------------------------------------------------------------------------
 // Job specification core data structures
 
-/// An owner of a job. If this value is not provided explicitly, a caller's email address
-// from the security context is used. If the security context does not contain this information, the request is rejected.
+/// An owner of a job.
 message Owner {
-    /// (Optional) An owner's email address. If not set directly, the email address is read from the caller's security context.
+    /// (Required) An owner's email address.
     string teamEmail = 1;
 }
 
diff --git a/vendor/vendor.json b/vendor/vendor.json
index d9902ca21..0408d5c7d 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -39,12 +39,12 @@
 			"revisionTime": "2017-10-19T18:51:21Z"
 		},
 		{
-			"checksumSHA1": "NvehXhIFWCkMYuPVopAMoHLLKKs=",
+			"checksumSHA1": "EBkLjtdY7+E2a8JPpKweleTNgaM=",
 			"path": "github.com/Netflix/titus-api-definitions/src/main/proto/netflix/titus",
-			"revision": "9c69a889db2879326cb23eeed480439d37ce3600",
-			"revisionTime": "2018-04-05T19:38:32Z",
-			"version": "master",
-			"versionExact": "master"
+			"revision": "0354642c5c334476a9ee093c2a6f3f9881dcb52f",
+			"revisionTime": "2018-05-08T22:00:19Z",
+			"version": "frozen-agent-version-20180508.0",
+			"versionExact": "frozen-agent-version-20180508.0"
 		},
 		{
 			"checksumSHA1": "7eAIWei337IlBYIfzA3HyOEV9WE=",