Merge "[SO] SO Admin Cockpit ServiceMesh compatibility"