Merge "[MODELING] Service Mesh Compatibility"