[MSB] Make MSB ServiceMesh compatible