Merge "[CDS] Service mesh compatibility"