Merge "[AAI] Service Mesh compatibility"