diff --git a/mesh/v1alpha1/config.pb.go b/mesh/v1alpha1/config.pb.go
index 6113a1f6efc..bd01b0e1437 100644
--- a/mesh/v1alpha1/config.pb.go
+++ b/mesh/v1alpha1/config.pb.go
@@ -8,6 +8,7 @@ It is generated from these files:
 	mesh/v1alpha1/config.proto
 
 It has these top-level messages:
+	ServerAddress
 	ProxyConfig
 	MeshConfig
 */
@@ -95,7 +96,7 @@ func (x MeshConfig_IngressControllerMode) String() string {
 	return proto.EnumName(MeshConfig_IngressControllerMode_name, int32(x))
 }
 func (MeshConfig_IngressControllerMode) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{1, 0}
+	return fileDescriptor0, []int{2, 0}
 }
 
 // TODO AuthPolicy needs to be removed and merged with AuthPolicy defined above
@@ -120,7 +121,35 @@ var MeshConfig_AuthPolicy_value = map[string]int32{
 func (x MeshConfig_AuthPolicy) String() string {
 	return proto.EnumName(MeshConfig_AuthPolicy_name, int32(x))
 }
-func (MeshConfig_AuthPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 1} }
+func (MeshConfig_AuthPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
+
+// ServerAddress specifies the address of Istio components like mixer, pilot, etc.
+// At least one of the field needs to be specified.
+type ServerAddress struct {
+	// The address for mTLS server, e.g., (_istio-pilot:15003_)
+	MutualTls string `protobuf:"bytes,1,opt,name=mutual_tls,json=mutualTls" json:"mutual_tls,omitempty"`
+	// The address for plain text server, e.g., (_istio-pilot:15005_)
+	PlainText string `protobuf:"bytes,2,opt,name=plain_text,json=plainText" json:"plain_text,omitempty"`
+}
+
+func (m *ServerAddress) Reset()                    { *m = ServerAddress{} }
+func (m *ServerAddress) String() string            { return proto.CompactTextString(m) }
+func (*ServerAddress) ProtoMessage()               {}
+func (*ServerAddress) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *ServerAddress) GetMutualTls() string {
+	if m != nil {
+		return m.MutualTls
+	}
+	return ""
+}
+
+func (m *ServerAddress) GetPlainText() string {
+	if m != nil {
+		return m.PlainText
+	}
+	return ""
+}
 
 // ProxyConfig defines variables for individual Envoy instances.
 type ProxyConfig struct {
@@ -150,7 +179,7 @@ type ProxyConfig struct {
 	// parent process during a hot restart. MUST be >=1s (e.g., _1s/1m/1h_).
 	// MUST BE greater than _drain_duration_ parameter.
 	ParentShutdownDuration *google_protobuf.Duration `protobuf:"bytes,5,opt,name=parent_shutdown_duration,json=parentShutdownDuration" json:"parent_shutdown_duration,omitempty"`
-	// Address of the discovery service exposing xDS (e.g. _istio-pilot:8080_).
+	// Deprecated, use server_address instead.
 	DiscoveryAddress string `protobuf:"bytes,6,opt,name=discovery_address,json=discoveryAddress" json:"discovery_address,omitempty"`
 	// Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms)
 	DiscoveryRefreshDelay *google_protobuf.Duration `protobuf:"bytes,7,opt,name=discovery_refresh_delay,json=discoveryRefreshDelay" json:"discovery_refresh_delay,omitempty"`
@@ -180,12 +209,14 @@ type ProxyConfig struct {
 	StatNameLength int32 `protobuf:"varint,15,opt,name=stat_name_length,json=statNameLength" json:"stat_name_length,omitempty"`
 	// The number of worker threads to run. Default value is number of cores on the machine.
 	Concurrency int32 `protobuf:"varint,16,opt,name=concurrency" json:"concurrency,omitempty"`
+	// Address of the discovery service exposing xDS.
+	Pilot *ServerAddress `protobuf:"bytes,17,opt,name=pilot" json:"pilot,omitempty"`
 }
 
 func (m *ProxyConfig) Reset()                    { *m = ProxyConfig{} }
 func (m *ProxyConfig) String() string            { return proto.CompactTextString(m) }
 func (*ProxyConfig) ProtoMessage()               {}
-func (*ProxyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+func (*ProxyConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *ProxyConfig) GetConfigPath() string {
 	if m != nil {
@@ -299,24 +330,19 @@ func (m *ProxyConfig) GetConcurrency() int32 {
 	return 0
 }
 
+func (m *ProxyConfig) GetPilot() *ServerAddress {
+	if m != nil {
+		return m.Pilot
+	}
+	return nil
+}
+
 // MeshConfig defines mesh-wide variables shared by all Envoy instances in the
 // Istio service mesh.
 type MeshConfig struct {
-	// Address of the server that will be used by the proxies for policy
-	// check calls (e.g. _istio-mixer:15004_). By using different names for
-	// mixerCheckServer and mixerReportServer, it is possible to have one set
-	// of mixer servers handle policy check calls, while another set of mixer
-	// servers handle telemetry calls.
-	//
-	// NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
-	// equivalent to setting disablePolicyChecks to true.
+	// Deprecated, use mixer_check instead.
 	MixerCheckServer string `protobuf:"bytes,1,opt,name=mixer_check_server,json=mixerCheckServer" json:"mixer_check_server,omitempty"`
-	// Address of the server that will be used by the proxies as an Istio
-	// telemetry sink (access logs, API/connection metrics)
-	// (e.g. _istio-mixer:15004_). By using different names for
-	// mixerCheckServer and mixerReportServer, it is possible to have one set
-	// of mixer servers handle policy check calls, while another set of mixer
-	// servers handle telemetry calls.
+	// Deprecated, use mixer_report instead.
 	MixerReportServer string `protobuf:"bytes,2,opt,name=mixer_report_server,json=mixerReportServer" json:"mixer_report_server,omitempty"`
 	// Disable policy checks by the mixer service. Default
 	// is false, i.e. mixer policy check is enabled by default.
@@ -362,14 +388,25 @@ type MeshConfig struct {
 	// Instead, use service-level annotations to overwrite the authentication policy.
 	MtlsExcludedServices []string `protobuf:"bytes,15,rep,name=mtls_excluded_services,json=mtlsExcludedServices" json:"mtls_excluded_services,omitempty"`
 	// DEPRECATED. Mixer address. This option will be removed soon. Please
-	// use mixer_check_server and mixer_report_server.
+	// use mixer_check and mixer_report.
 	MixerAddress string `protobuf:"bytes,16,opt,name=mixer_address,json=mixerAddress" json:"mixer_address,omitempty"`
+	// Address of the server that will be used by the proxies for policy
+	// check calls. By using different names for mixerCheck and mixerReport, it
+	// is possible to have one set of mixer servers handle policy check calls,
+	// while another set of mixer servers handle telemetry calls.
+	//
+	// NOTE: Omitting mixerCheck while specifying mixerReport is
+	// equivalent to setting disablePolicyChecks to true.
+	MixerCheck *ServerAddress `protobuf:"bytes,17,opt,name=mixer_check,json=mixerCheck" json:"mixer_check,omitempty"`
+	// Address of the server that will be used by the proxies for policy report
+	// calls.
+	MixerReport *ServerAddress `protobuf:"bytes,18,opt,name=mixer_report,json=mixerReport" json:"mixer_report,omitempty"`
 }
 
 func (m *MeshConfig) Reset()                    { *m = MeshConfig{} }
 func (m *MeshConfig) String() string            { return proto.CompactTextString(m) }
 func (*MeshConfig) ProtoMessage()               {}
-func (*MeshConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+func (*MeshConfig) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 func (m *MeshConfig) GetMixerCheckServer() string {
 	if m != nil {
@@ -483,7 +520,22 @@ func (m *MeshConfig) GetMixerAddress() string {
 	return ""
 }
 
+func (m *MeshConfig) GetMixerCheck() *ServerAddress {
+	if m != nil {
+		return m.MixerCheck
+	}
+	return nil
+}
+
+func (m *MeshConfig) GetMixerReport() *ServerAddress {
+	if m != nil {
+		return m.MixerReport
+	}
+	return nil
+}
+
 func init() {
+	proto.RegisterType((*ServerAddress)(nil), "istio.mesh.v1alpha1.ServerAddress")
 	proto.RegisterType((*ProxyConfig)(nil), "istio.mesh.v1alpha1.ProxyConfig")
 	proto.RegisterType((*MeshConfig)(nil), "istio.mesh.v1alpha1.MeshConfig")
 	proto.RegisterEnum("istio.mesh.v1alpha1.AuthenticationPolicy", AuthenticationPolicy_name, AuthenticationPolicy_value)
@@ -494,65 +546,71 @@ func init() {
 func init() { proto.RegisterFile("mesh/v1alpha1/config.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 958 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4b, 0x6f, 0x1b, 0x37,
-	0x10, 0x8e, 0xfc, 0x92, 0x3d, 0xb2, 0x56, 0x6b, 0x3a, 0x76, 0x36, 0x46, 0xd1, 0x0a, 0x2e, 0x9a,
-	0xaa, 0x6e, 0x20, 0x21, 0x6e, 0x7b, 0xe8, 0xa5, 0xa8, 0x9f, 0x8d, 0x01, 0xf9, 0xd1, 0x95, 0x7c,
-	0xc9, 0x85, 0xa0, 0x77, 0x69, 0x2d, 0x11, 0x8a, 0x5c, 0x90, 0x5c, 0xd7, 0xca, 0x9f, 0x2d, 0x7a,
-	0xeb, 0xcf, 0x28, 0xf8, 0x90, 0xac, 0x06, 0x2a, 0x8c, 0x1e, 0xf5, 0xcd, 0x37, 0x33, 0x3b, 0x9c,
-	0xef, 0x1b, 0xc1, 0xde, 0x98, 0xea, 0xa2, 0xf7, 0xf0, 0x8e, 0xf0, 0xb2, 0x20, 0xef, 0x7a, 0x99,
-	0x14, 0xf7, 0x6c, 0xd4, 0x2d, 0x95, 0x34, 0x12, 0x6d, 0x33, 0x6d, 0x98, 0xec, 0x5a, 0x46, 0x77,
-	0xca, 0xd8, 0xfb, 0x72, 0x24, 0xe5, 0x88, 0xd3, 0x9e, 0xa3, 0xdc, 0x55, 0xf7, 0xbd, 0xbc, 0x52,
-	0xc4, 0x30, 0x29, 0x7c, 0xd2, 0xfe, 0x9f, 0x6b, 0xd0, 0xb8, 0x51, 0xf2, 0x71, 0x72, 0xe2, 0x4a,
-	0xa1, 0xaf, 0xa0, 0xe1, 0x8b, 0xe2, 0x92, 0x98, 0x22, 0xa9, 0xb5, 0x6b, 0x9d, 0x8d, 0x14, 0x3c,
-	0x74, 0x43, 0x4c, 0x61, 0x09, 0x77, 0x4c, 0x10, 0x35, 0xf1, 0x84, 0x25, 0x4f, 0xf0, 0x90, 0x23,
-	0x7c, 0x0b, 0x2d, 0x4d, 0xd5, 0x03, 0xcb, 0x28, 0xce, 0x78, 0xa5, 0x0d, 0x55, 0xc9, 0xb2, 0x23,
-	0x45, 0x01, 0x3e, 0xf1, 0x28, 0xfa, 0x15, 0xa2, 0x5c, 0x11, 0x26, 0xf0, 0xf4, 0x93, 0x92, 0x95,
-	0x76, 0xad, 0xd3, 0x38, 0x7c, 0xdd, 0xf5, 0xdf, 0xdc, 0x9d, 0x7e, 0x73, 0xf7, 0x34, 0x10, 0xd2,
-	0xa6, 0x4b, 0x98, 0xfe, 0x44, 0x03, 0x48, 0x4a, 0xa2, 0xa8, 0x30, 0x58, 0x17, 0x95, 0xc9, 0xe5,
-	0x1f, 0x73, 0xb5, 0x56, 0x9f, 0xab, 0xb5, 0xeb, 0x53, 0x07, 0x21, 0x73, 0x56, 0xf4, 0x7b, 0xd8,
-	0xca, 0x99, 0xce, 0xe4, 0x03, 0x55, 0x13, 0x4c, 0xf2, 0x5c, 0x51, 0xad, 0x93, 0x35, 0x37, 0x41,
-	0x3c, 0x0b, 0x1c, 0x79, 0x1c, 0xfd, 0x0e, 0xaf, 0x9e, 0xc8, 0x8a, 0xde, 0x2b, 0xaa, 0x0b, 0x9c,
-	0x53, 0x4e, 0x26, 0x49, 0xfd, 0xb9, 0x0f, 0xd8, 0x99, 0x65, 0xa6, 0x3e, 0xf1, 0xd4, 0xe6, 0xa1,
-	0x6f, 0x20, 0xfa, 0xc4, 0xca, 0x8f, 0x4c, 0xcc, 0x9a, 0xaf, 0xbb, 0xe6, 0x4d, 0x8f, 0x4e, 0x3b,
-	0x1f, 0x43, 0x2b, 0x93, 0x42, 0xd0, 0xcc, 0x60, 0xc3, 0xc6, 0x54, 0x56, 0x26, 0xd9, 0x78, 0xae,
-	0x63, 0x14, 0x32, 0x86, 0x3e, 0x01, 0xbd, 0x05, 0xa4, 0x0d, 0x31, 0x3a, 0xc7, 0x55, 0x5e, 0xce,
-	0xda, 0x81, 0x9f, 0xd5, 0x47, 0x6e, 0xf3, 0x72, 0xda, 0xb1, 0x03, 0x71, 0x69, 0x95, 0x82, 0x49,
-	0x3e, 0x66, 0x02, 0x97, 0x52, 0x99, 0xa4, 0xd1, 0xae, 0x75, 0x56, 0xd3, 0xc8, 0xe1, 0x47, 0x16,
-	0xbe, 0x91, 0xca, 0xd8, 0x27, 0x24, 0x0f, 0x84, 0x71, 0x72, 0xc7, 0x38, 0x33, 0x13, 0xfc, 0x49,
-	0x0a, 0x9a, 0x6c, 0xfa, 0xb2, 0xf3, 0x81, 0x0f, 0x52, 0x50, 0x94, 0xc3, 0xeb, 0x4c, 0x0a, 0xa3,
-	0x24, 0xc7, 0x25, 0x27, 0x82, 0x62, 0x52, 0x99, 0x02, 0x97, 0x92, 0xb3, 0x6c, 0x92, 0x34, 0xdb,
-	0xb5, 0x4e, 0x74, 0xf8, 0x5d, 0x77, 0x81, 0xb4, 0xbb, 0x47, 0x95, 0x29, 0xa8, 0x30, 0x2c, 0x73,
-	0xc3, 0xdd, 0xb8, 0x84, 0x74, 0x37, 0xd4, 0xba, 0xb1, 0xa5, 0x2c, 0xc3, 0xe3, 0x76, 0xd4, 0xac,
-	0xd2, 0x46, 0x8e, 0x71, 0x90, 0xf7, 0x3d, 0xe3, 0x34, 0x89, 0xfc, 0x37, 0xf9, 0x88, 0x77, 0xc0,
-	0x39, 0xe3, 0xd4, 0x8e, 0x6a, 0xc7, 0xc7, 0x82, 0x8c, 0x29, 0xe6, 0x54, 0x8c, 0x4c, 0x91, 0xb4,
-	0xfc, 0xa8, 0x16, 0xbf, 0x22, 0x63, 0xda, 0x77, 0x28, 0x6a, 0x3b, 0xbf, 0x64, 0x95, 0x52, 0x54,
-	0x64, 0x93, 0x24, 0x76, 0xa4, 0x79, 0x68, 0xff, 0xaf, 0x3a, 0xc0, 0x25, 0xd5, 0x45, 0x30, 0xd8,
-	0x5b, 0x40, 0x63, 0xf6, 0x48, 0x15, 0xce, 0x0a, 0x9a, 0x7d, 0xc4, 0xd6, 0x13, 0x54, 0x05, 0x9f,
-	0xc5, 0x2e, 0x72, 0x62, 0x03, 0x03, 0x87, 0xa3, 0x2e, 0x6c, 0x7b, 0xb6, 0xa2, 0xf6, 0xbd, 0xa7,
-	0x74, 0xef, 0xba, 0x2d, 0x17, 0x4a, 0x5d, 0x24, 0xf0, 0x0f, 0xc1, 0xaa, 0x8a, 0xdc, 0x71, 0x1a,
-	0x5e, 0xd0, 0xb7, 0xd1, 0xce, 0x82, 0xeb, 0xe9, 0x76, 0x08, 0xfa, 0x47, 0x71, 0x8d, 0x34, 0x3a,
-	0x80, 0x2d, 0xbf, 0x57, 0xce, 0xb4, 0xa1, 0x61, 0xb1, 0x2b, 0x6e, 0x90, 0x96, 0x0b, 0xf4, 0x1d,
-	0xee, 0x36, 0xfb, 0x06, 0x3c, 0x84, 0x0b, 0x63, 0x4a, 0xcf, 0x5c, 0x75, 0xcc, 0xa6, 0x83, 0xdf,
-	0x1b, 0x53, 0x3a, 0xde, 0x02, 0x75, 0xae, 0xfd, 0x5f, 0x75, 0x7e, 0x0d, 0x4d, 0x26, 0x46, 0x56,
-	0x7a, 0x38, 0xe3, 0x44, 0x6b, 0xe7, 0xa8, 0x8d, 0x74, 0x33, 0x80, 0x27, 0x16, 0xb3, 0xd7, 0x66,
-	0x4a, 0x0a, 0xe7, 0x25, 0xd8, 0x25, 0x0a, 0xf0, 0xc0, 0xa3, 0x68, 0x0c, 0xaf, 0x66, 0xd5, 0xbc,
-	0x44, 0x38, 0x55, 0x78, 0x2c, 0x73, 0xea, 0x7c, 0x13, 0x1d, 0xfe, 0xb4, 0x50, 0x64, 0x4f, 0x9b,
-	0xeb, 0x5e, 0x84, 0xbe, 0xb3, 0xec, 0x4b, 0x99, 0xd3, 0x74, 0x87, 0x2d, 0x82, 0xd1, 0x35, 0x34,
-	0xe6, 0x75, 0x0c, 0xae, 0xc5, 0xc1, 0x73, 0x2d, 0x9e, 0x04, 0x7b, 0xbc, 0x94, 0xd4, 0x52, 0x20,
-	0x4f, 0x02, 0x3e, 0x83, 0x2d, 0x95, 0xeb, 0xcf, 0x6e, 0x4c, 0xe3, 0xb9, 0x37, 0x6d, 0xa9, 0x5c,
-	0x7f, 0x7e, 0x5d, 0xa8, 0x70, 0xfa, 0x30, 0x8a, 0x64, 0x4c, 0x8c, 0x9c, 0x2f, 0xd7, 0xd3, 0xa6,
-	0x47, 0x87, 0x1e, 0xb4, 0x7b, 0x26, 0x59, 0x66, 0x1f, 0x8b, 0xcb, 0xe0, 0x95, 0xa6, 0xbf, 0x42,
-	0x1e, 0xee, 0x4b, 0x6f, 0x94, 0xdf, 0x20, 0xca, 0xe9, 0x3d, 0xa9, 0xb8, 0x09, 0xbe, 0x72, 0x96,
-	0x6a, 0x1c, 0xb6, 0x17, 0x4e, 0x3a, 0xf7, 0x47, 0x93, 0x36, 0x43, 0x5e, 0xb0, 0xc5, 0x8f, 0xb0,
-	0x3b, 0x36, 0x5c, 0x63, 0xfa, 0x98, 0xf1, 0x2a, 0xa7, 0xf9, 0x74, 0x9b, 0x3a, 0x69, 0xb5, 0x97,
-	0x3b, 0x1b, 0xe9, 0x4b, 0x1b, 0x3d, 0x0b, 0xc1, 0xb0, 0x53, 0x6d, 0x25, 0xe2, 0xed, 0x31, 0xbd,
-	0x5d, 0xb1, 0x97, 0x88, 0x03, 0xc3, 0xdd, 0xda, 0xff, 0x19, 0x76, 0x16, 0xae, 0x0e, 0xd5, 0x61,
-	0xf9, 0xfa, 0xfc, 0x3c, 0x7e, 0x81, 0x1a, 0x50, 0x3f, 0x3d, 0x3b, 0x3f, 0xba, 0xed, 0x0f, 0xe3,
-	0x1a, 0x02, 0x58, 0x1b, 0x0c, 0xd3, 0x8b, 0x93, 0x61, 0xbc, 0xb4, 0xff, 0x06, 0x60, 0xee, 0x86,
-	0xac, 0xc3, 0xca, 0xd5, 0xf5, 0xd5, 0x59, 0xfc, 0x02, 0x45, 0x00, 0x97, 0xb7, 0xc3, 0xdb, 0xa3,
-	0x3e, 0x1e, 0xf6, 0x07, 0x71, 0xed, 0xe0, 0x17, 0x78, 0xb9, 0xe8, 0x1a, 0xfd, 0x77, 0x06, 0xda,
-	0x84, 0xfa, 0xc5, 0xd5, 0xfb, 0xb3, 0xf4, 0x62, 0x18, 0xff, 0x5d, 0x3f, 0xfe, 0xe2, 0xc3, 0x9e,
-	0x7f, 0x2f, 0x26, 0x7b, 0xa4, 0x64, 0xbd, 0x7f, 0xfd, 0xcb, 0xdf, 0xad, 0xb9, 0xbd, 0xfe, 0xf0,
-	0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xde, 0xe8, 0x6d, 0xe0, 0xfd, 0x07, 0x00, 0x00,
+	// 1043 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x5b, 0x4f, 0x23, 0x47,
+	0x13, 0x5d, 0x73, 0x33, 0x94, 0xf1, 0x85, 0x66, 0x61, 0x67, 0xd1, 0xf7, 0x25, 0x96, 0xa3, 0x6c,
+	0x1c, 0xb2, 0xb2, 0xb5, 0x24, 0x91, 0x92, 0x97, 0x28, 0x60, 0x4c, 0x16, 0xc9, 0x5c, 0x32, 0x36,
+	0x2f, 0xfb, 0xd2, 0x6a, 0x66, 0x1a, 0x4f, 0x6b, 0x7b, 0xa6, 0x47, 0xdd, 0x3d, 0x04, 0xef, 0x3f,
+	0xc9, 0x3f, 0xcc, 0x4b, 0xfe, 0x43, 0xd4, 0x97, 0x31, 0xde, 0x95, 0x23, 0xb2, 0x8f, 0x9c, 0x3a,
+	0x55, 0x35, 0x55, 0x7d, 0x4e, 0x61, 0x38, 0x48, 0xa9, 0x4a, 0xfa, 0xf7, 0x6f, 0x08, 0xcf, 0x13,
+	0xf2, 0xa6, 0x1f, 0x89, 0xec, 0x8e, 0x4d, 0x7b, 0xb9, 0x14, 0x5a, 0xa0, 0x5d, 0xa6, 0x34, 0x13,
+	0x3d, 0xc3, 0xe8, 0x95, 0x8c, 0x83, 0x2f, 0xa6, 0x42, 0x4c, 0x39, 0xed, 0x5b, 0xca, 0x6d, 0x71,
+	0xd7, 0x8f, 0x0b, 0x49, 0x34, 0x13, 0x99, 0x4b, 0xea, 0x5c, 0x40, 0x7d, 0x4c, 0xe5, 0x3d, 0x95,
+	0xc7, 0x71, 0x2c, 0xa9, 0x52, 0xe8, 0xff, 0x00, 0x69, 0xa1, 0x0b, 0xc2, 0xb1, 0xe6, 0x2a, 0xa8,
+	0xb4, 0x2b, 0xdd, 0xad, 0x70, 0xcb, 0x21, 0x13, 0x6e, 0xc3, 0x39, 0x27, 0x2c, 0xc3, 0x9a, 0x3e,
+	0xe8, 0x60, 0xc5, 0x85, 0x2d, 0x32, 0xa1, 0x0f, 0xba, 0xf3, 0x67, 0x15, 0x6a, 0xd7, 0x52, 0x3c,
+	0xcc, 0x06, 0xf6, 0xcb, 0xd0, 0x97, 0x50, 0x73, 0xdf, 0x88, 0x73, 0xa2, 0x13, 0x5f, 0x0e, 0x1c,
+	0x74, 0x4d, 0x74, 0x62, 0x08, 0xb7, 0x2c, 0x23, 0x72, 0xe6, 0x08, 0xae, 0x20, 0x38, 0xc8, 0x12,
+	0xbe, 0x81, 0xa6, 0xa2, 0xf2, 0x9e, 0x45, 0x14, 0x47, 0xbc, 0x50, 0x9a, 0xca, 0x60, 0xd5, 0x92,
+	0x1a, 0x1e, 0x1e, 0x38, 0x14, 0xfd, 0x0a, 0x8d, 0x58, 0x9a, 0x2f, 0x2b, 0x27, 0x0c, 0xd6, 0xda,
+	0x95, 0x6e, 0xed, 0xe8, 0x65, 0xcf, 0xad, 0xa0, 0x57, 0xae, 0xa0, 0x77, 0xea, 0x09, 0x61, 0xdd,
+	0x26, 0x94, 0x7f, 0xa2, 0x31, 0x04, 0x39, 0x91, 0x34, 0xd3, 0x58, 0x25, 0x85, 0x8e, 0xc5, 0x1f,
+	0x0b, 0xb5, 0xd6, 0x9f, 0xaa, 0xb5, 0xef, 0x52, 0xc7, 0x3e, 0x73, 0x5e, 0xf4, 0x3b, 0xd8, 0x89,
+	0x99, 0x8a, 0xc4, 0x3d, 0x95, 0x33, 0x4c, 0xdc, 0x92, 0x83, 0x0d, 0x3b, 0x41, 0x6b, 0x1e, 0x28,
+	0x97, 0xff, 0x3b, 0xbc, 0x78, 0x24, 0x4b, 0x7a, 0x27, 0xa9, 0x4a, 0x70, 0x4c, 0x39, 0x99, 0x05,
+	0xd5, 0xa7, 0x3e, 0x60, 0x6f, 0x9e, 0x19, 0xba, 0xc4, 0x53, 0x93, 0x87, 0xbe, 0x86, 0xc6, 0x07,
+	0x96, 0xbf, 0x67, 0xd9, 0xbc, 0xf9, 0xa6, 0x6d, 0x5e, 0x77, 0x68, 0xd9, 0xf9, 0x04, 0x9a, 0x91,
+	0xc8, 0x32, 0x1a, 0x69, 0xac, 0x59, 0x4a, 0x45, 0xa1, 0x83, 0xad, 0xa7, 0x3a, 0x36, 0x7c, 0xc6,
+	0xc4, 0x25, 0xa0, 0xd7, 0x80, 0x94, 0x26, 0x5a, 0xc5, 0xb8, 0x88, 0xf3, 0x79, 0x3b, 0x70, 0xb3,
+	0xba, 0xc8, 0x4d, 0x9c, 0x97, 0x1d, 0xbb, 0xd0, 0xca, 0x8d, 0x52, 0x30, 0x89, 0x53, 0x96, 0xe1,
+	0x5c, 0x48, 0x1d, 0xd4, 0xda, 0x95, 0xee, 0x7a, 0xd8, 0xb0, 0xf8, 0xb1, 0x81, 0xaf, 0x85, 0xd4,
+	0x66, 0x85, 0xe4, 0x9e, 0x30, 0x4e, 0x6e, 0x19, 0x67, 0x7a, 0x86, 0x3f, 0x88, 0x8c, 0x06, 0xdb,
+	0xae, 0xec, 0x62, 0xe0, 0x9d, 0xc8, 0x28, 0x8a, 0xe1, 0x65, 0x24, 0x32, 0x2d, 0x05, 0xc7, 0x39,
+	0x27, 0x19, 0xc5, 0xa4, 0xd0, 0x09, 0xce, 0x05, 0x67, 0xd1, 0x2c, 0xa8, 0xb7, 0x2b, 0xdd, 0xc6,
+	0xd1, 0xb7, 0xbd, 0x25, 0x4e, 0xe9, 0x1d, 0x17, 0x3a, 0xa1, 0x99, 0x66, 0x91, 0x1d, 0xee, 0xda,
+	0x26, 0x84, 0xfb, 0xbe, 0xd6, 0xb5, 0x29, 0x65, 0x18, 0x0e, 0x37, 0xa3, 0x46, 0x85, 0xd2, 0x22,
+	0xc5, 0x5e, 0xde, 0x77, 0x8c, 0xd3, 0xa0, 0xe1, 0xbe, 0xc9, 0x45, 0x9c, 0x03, 0xce, 0x18, 0xa7,
+	0x66, 0x54, 0x33, 0x3e, 0xce, 0x48, 0x4a, 0x31, 0xa7, 0xd9, 0x54, 0x27, 0x41, 0xd3, 0x8d, 0x6a,
+	0xf0, 0x4b, 0x92, 0xd2, 0x91, 0x45, 0x51, 0xdb, 0xfa, 0x25, 0x2a, 0xa4, 0xa4, 0x59, 0x34, 0x0b,
+	0x5a, 0x96, 0xb4, 0x08, 0xa1, 0x9f, 0x60, 0x3d, 0x67, 0x5c, 0xe8, 0x60, 0xc7, 0x3e, 0x4f, 0x67,
+	0xe9, 0x2c, 0x1f, 0x59, 0x3a, 0x74, 0x09, 0x9d, 0xbf, 0x37, 0x01, 0x2e, 0xa8, 0x4a, 0xbc, 0x35,
+	0x5f, 0x03, 0x4a, 0xd9, 0x03, 0x95, 0x38, 0x4a, 0x68, 0xf4, 0x1e, 0x2b, 0x9b, 0xe2, 0x1d, 0xda,
+	0xb2, 0x91, 0x81, 0x09, 0xb8, 0x52, 0xa8, 0x07, 0xbb, 0x8e, 0x2d, 0xa9, 0x79, 0xa9, 0x92, 0xee,
+	0xfc, 0xba, 0x63, 0x43, 0xa1, 0x8d, 0x78, 0xfe, 0x11, 0x18, 0x3d, 0x92, 0x5b, 0x4e, 0xfd, 0xee,
+	0x5d, 0x1b, 0x65, 0xcd, 0xbb, 0x19, 0xee, 0xfa, 0xa0, 0x5b, 0xa7, 0x6d, 0xa4, 0xd0, 0x21, 0xec,
+	0x38, 0x45, 0x70, 0xa6, 0x34, 0xf5, 0x92, 0x58, 0xb3, 0x2b, 0x68, 0xda, 0xc0, 0xc8, 0xe2, 0x56,
+	0x13, 0xaf, 0xc0, 0x41, 0x38, 0xd1, 0x3a, 0x77, 0xcc, 0x75, 0xcb, 0xac, 0x5b, 0xf8, 0xad, 0xd6,
+	0xb9, 0xe5, 0x2d, 0xd1, 0xf5, 0xc6, 0xe7, 0xea, 0xfa, 0x2b, 0xa8, 0xb3, 0x6c, 0x6a, 0x56, 0x89,
+	0x23, 0x4e, 0x94, 0xb2, 0x5e, 0xdc, 0x0a, 0xb7, 0x3d, 0x38, 0x30, 0x98, 0xb9, 0x53, 0x25, 0xc9,
+	0x1f, 0x26, 0x6f, 0xb4, 0x86, 0x87, 0xc7, 0x0e, 0x45, 0x29, 0xbc, 0x98, 0x57, 0x73, 0xe2, 0xe2,
+	0x54, 0xe2, 0x54, 0xc4, 0xd4, 0x3a, 0xae, 0x71, 0xf4, 0xe3, 0xd2, 0x27, 0x7d, 0x7c, 0xb9, 0xde,
+	0xb9, 0xef, 0x3b, 0xcf, 0xbe, 0x10, 0x31, 0x0d, 0xf7, 0xd8, 0x32, 0x18, 0x5d, 0x41, 0x6d, 0xd1,
+	0x01, 0x60, 0x5b, 0x1c, 0x3e, 0xd5, 0xe2, 0x51, 0xea, 0x27, 0x2b, 0x41, 0x25, 0x04, 0xf2, 0x28,
+	0xfd, 0x21, 0xec, 0xc8, 0x58, 0x7d, 0x72, 0x9d, 0x6a, 0x4f, 0xed, 0xb4, 0x29, 0x63, 0xf5, 0xe9,
+	0x5d, 0xa2, 0x99, 0xd5, 0x87, 0x96, 0x24, 0x62, 0xd9, 0xd4, 0x3a, 0x7a, 0x33, 0xac, 0x3b, 0x74,
+	0xe2, 0x40, 0xf3, 0xce, 0x24, 0x8a, 0xcc, 0xb2, 0xb8, 0xf0, 0x2e, 0xab, 0xbb, 0xfb, 0xe5, 0xe0,
+	0x91, 0x70, 0x16, 0xfb, 0x0d, 0x1a, 0x31, 0xbd, 0x23, 0x05, 0xd7, 0xde, 0x91, 0xd6, 0x8c, 0xb5,
+	0xa3, 0xf6, 0xd2, 0x49, 0x17, 0xfe, 0x45, 0x85, 0x75, 0x9f, 0xe7, 0x6d, 0xf1, 0x03, 0xec, 0xa7,
+	0x9a, 0x2b, 0x4c, 0x1f, 0x22, 0x5e, 0xc4, 0x34, 0x2e, 0x5f, 0x53, 0x05, 0xcd, 0xf6, 0x6a, 0x77,
+	0x2b, 0x7c, 0x6e, 0xa2, 0x43, 0x1f, 0xf4, 0x6f, 0xaa, 0x8c, 0x44, 0x9c, 0x3d, 0xca, 0xab, 0xd7,
+	0x72, 0x12, 0xb1, 0x60, 0x79, 0xf1, 0x06, 0x50, 0x5b, 0x70, 0xdc, 0x67, 0x18, 0x18, 0x1e, 0xed,
+	0x88, 0x86, 0xb0, 0xbd, 0x68, 0xc4, 0x00, 0xfd, 0xe7, 0x2a, 0xb5, 0x05, 0x97, 0x76, 0x7e, 0x86,
+	0xbd, 0xa5, 0x32, 0x42, 0x55, 0x58, 0xbd, 0x3a, 0x3b, 0x6b, 0x3d, 0x43, 0x35, 0xa8, 0x9e, 0x0e,
+	0xcf, 0x8e, 0x6f, 0x46, 0x93, 0x56, 0x05, 0x01, 0x6c, 0x8c, 0x27, 0xe1, 0xf9, 0x60, 0xd2, 0x5a,
+	0xe9, 0xbc, 0x02, 0x58, 0xb8, 0x84, 0x9b, 0xb0, 0x76, 0x79, 0x75, 0x39, 0x6c, 0x3d, 0x43, 0x0d,
+	0x80, 0x8b, 0x9b, 0xc9, 0xcd, 0xf1, 0x08, 0x4f, 0x46, 0xe3, 0x56, 0xe5, 0xf0, 0x17, 0x78, 0xbe,
+	0xec, 0xa6, 0xfe, 0x7b, 0x06, 0xda, 0x86, 0xea, 0xf9, 0xe5, 0xdb, 0x61, 0x78, 0x3e, 0x69, 0xfd,
+	0x55, 0x3d, 0xf9, 0xdf, 0xbb, 0x03, 0x37, 0x14, 0x13, 0x7d, 0x92, 0xb3, 0xfe, 0x47, 0x3f, 0x7d,
+	0x6e, 0x37, 0xac, 0xc6, 0xbe, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x74, 0xbd, 0x2a, 0x4d, 0x12,
+	0x09, 0x00, 0x00,
 }
diff --git a/mesh/v1alpha1/config.proto b/mesh/v1alpha1/config.proto
index 8dc99f665dc..99723cb2aeb 100644
--- a/mesh/v1alpha1/config.proto
+++ b/mesh/v1alpha1/config.proto
@@ -41,6 +41,16 @@ enum AuthenticationPolicy {
   INHERIT = 1000;
 }
 
+// ServerAddress specifies the address of Istio components like mixer, pilot, etc.
+// At least one of the field needs to be specified.
+message ServerAddress {
+  // The address for mTLS server, e.g., (_istio-pilot:15003_)
+  string mutual_tls = 1;
+
+  // The address for plain text server, e.g., (_istio-pilot:15005_)
+  string plain_text = 2;
+}
+
 // ProxyConfig defines variables for individual Envoy instances.
 message ProxyConfig {
   // Path to the generated configuration file directory.
@@ -74,7 +84,7 @@ message ProxyConfig {
   // MUST BE greater than _drain_duration_ parameter.
   google.protobuf.Duration parent_shutdown_duration = 5;
 
-  // Address of the discovery service exposing xDS (e.g. _istio-pilot:8080_).
+  // Deprecated, use server_address instead.
   string discovery_address = 6;
 
   // Polling interval for service discovery (used by EDS, CDS, LDS, but not RDS). (MUST BE >=1ms)
@@ -112,27 +122,18 @@ message ProxyConfig {
 
   // The number of worker threads to run. Default value is number of cores on the machine.
   int32 concurrency = 16;
+
+  // Address of the discovery service exposing xDS.
+  ServerAddress pilot = 17;
 }
 
 // MeshConfig defines mesh-wide variables shared by all Envoy instances in the
 // Istio service mesh.
 message MeshConfig {
-  // Address of the server that will be used by the proxies for policy
-  // check calls (e.g. _istio-mixer:15004_). By using different names for
-  // mixerCheckServer and mixerReportServer, it is possible to have one set
-  // of mixer servers handle policy check calls, while another set of mixer
-  // servers handle telemetry calls.
-  //
-  // NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
-  // equivalent to setting disablePolicyChecks to true.
+  // Deprecated, use mixer_check instead.
   string mixer_check_server = 1;
 
-  // Address of the server that will be used by the proxies as an Istio
-  // telemetry sink (access logs, API/connection metrics)
-  // (e.g. _istio-mixer:15004_). By using different names for
-  // mixerCheckServer and mixerReportServer, it is possible to have one set
-  // of mixer servers handle policy check calls, while another set of mixer
-  // servers handle telemetry calls.
+  // Deprecated, use mixer_report instead.
   string mixer_report_server = 2;
 
   // Disable policy checks by the mixer service. Default
@@ -220,6 +221,19 @@ message MeshConfig {
   repeated string mtls_excluded_services = 15;
 
   // DEPRECATED. Mixer address. This option will be removed soon. Please
-  // use mixer_check_server and mixer_report_server.
+  // use mixer_check and mixer_report.
   string mixer_address = 16;
+
+  // Address of the server that will be used by the proxies for policy
+  // check calls. By using different names for mixerCheck and mixerReport, it
+  // is possible to have one set of mixer servers handle policy check calls,
+  // while another set of mixer servers handle telemetry calls.
+  //
+  // NOTE: Omitting mixerCheck while specifying mixerReport is
+  // equivalent to setting disablePolicyChecks to true.
+  ServerAddress mixer_check = 17;
+
+  // Address of the server that will be used by the proxies for policy report
+  // calls.
+  ServerAddress mixer_report = 18;
 }
diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index f6d80d17f8c..62d75e83136 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -4,7 +4,7 @@
 location: https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html
 layout: protoc-gen-docs
 redirect_from: /docs/reference/config/service-mesh.html
-number_of_entries: 5
+number_of_entries: 6
 ---
 <h2 id="AuthenticationPolicy">AuthenticationPolicy</h2>
 <section>
@@ -64,14 +64,7 @@ <h2 id="MeshConfig">MeshConfig</h2>
 <td><code>mixerCheckServer</code></td>
 <td><code>string</code></td>
 <td>
-<p>Address of the server that will be used by the proxies for policy
-check calls (e.g. <em>istio-mixer:15004</em>). By using different names for
-mixerCheckServer and mixerReportServer, it is possible to have one set
-of mixer servers handle policy check calls, while another set of mixer
-servers handle telemetry calls.</p>
-
-<p>NOTE: Omitting mixerCheckServer while specifying mixerReportServer is
-equivalent to setting disablePolicyChecks to true.</p>
+<p>Deprecated, use mixer_check instead.</p>
 
 </td>
 </tr>
@@ -79,12 +72,7 @@ <h2 id="MeshConfig">MeshConfig</h2>
 <td><code>mixerReportServer</code></td>
 <td><code>string</code></td>
 <td>
-<p>Address of the server that will be used by the proxies as an Istio
-telemetry sink (access logs, API/connection metrics)
-(e.g. <em>istio-mixer:15004</em>). By using different names for
-mixerCheckServer and mixerReportServer, it is possible to have one set
-of mixer servers handle policy check calls, while another set of mixer
-servers handle telemetry calls.</p>
+<p>Deprecated, use mixer_report instead.</p>
 
 </td>
 </tr>
@@ -214,7 +202,30 @@ <h2 id="MeshConfig">MeshConfig</h2>
 <td><code>string</code></td>
 <td>
 <p>DEPRECATED. Mixer address. This option will be removed soon. Please
-use mixer<em>check</em>server and mixer<em>report</em>server.</p>
+use mixer<em>check and mixer</em>report.</p>
+
+</td>
+</tr>
+<tr id="MeshConfig.mixer_check">
+<td><code>mixerCheck</code></td>
+<td><code><a href="#ServerAddress">ServerAddress</a></code></td>
+<td>
+<p>Address of the server that will be used by the proxies for policy
+check calls. By using different names for mixerCheck and mixerReport, it
+is possible to have one set of mixer servers handle policy check calls,
+while another set of mixer servers handle telemetry calls.</p>
+
+<p>NOTE: Omitting mixerCheck while specifying mixerReport is
+equivalent to setting disablePolicyChecks to true.</p>
+
+</td>
+</tr>
+<tr id="MeshConfig.mixer_report">
+<td><code>mixerReport</code></td>
+<td><code><a href="#ServerAddress">ServerAddress</a></code></td>
+<td>
+<p>Address of the server that will be used by the proxies for policy report
+calls.</p>
 
 </td>
 </tr>
@@ -365,7 +376,7 @@ <h2 id="ProxyConfig">ProxyConfig</h2>
 <td><code>discoveryAddress</code></td>
 <td><code>string</code></td>
 <td>
-<p>Address of the discovery service exposing xDS (e.g. <em>istio-pilot:8080</em>).</p>
+<p>Deprecated, use server_address instead.</p>
 
 </td>
 </tr>
@@ -455,6 +466,47 @@ <h2 id="ProxyConfig">ProxyConfig</h2>
 <td>
 <p>The number of worker threads to run. Default value is number of cores on the machine.</p>
 
+</td>
+</tr>
+<tr id="ProxyConfig.pilot">
+<td><code>pilot</code></td>
+<td><code><a href="#ServerAddress">ServerAddress</a></code></td>
+<td>
+<p>Address of the discovery service exposing xDS.</p>
+
+</td>
+</tr>
+</tbody>
+</table>
+</section>
+<h2 id="ServerAddress">ServerAddress</h2>
+<section>
+<p>ServerAddress specifies the address of Istio components like mixer, pilot, etc.
+At least one of the field needs to be specified.</p>
+
+<table class="message-fields">
+<thead>
+<tr>
+<th>Field</th>
+<th>Type</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr id="ServerAddress.mutual_tls">
+<td><code>mutualTls</code></td>
+<td><code>string</code></td>
+<td>
+<p>The address for mTLS server, e.g., (<em>istio-pilot:15003</em>)</p>
+
+</td>
+</tr>
+<tr id="ServerAddress.plain_text">
+<td><code>plainText</code></td>
+<td><code>string</code></td>
+<td>
+<p>The address for plain text server, e.g., (<em>istio-pilot:15005</em>)</p>
+
 </td>
 </tr>
 </tbody>