Merge "[OOF] Make OOF ServiceMesh compatible"