Merge "[SDNC] SDNC ServiceMesh compatibility"