Merge "[SO] Service mesh compatibility"