Merge "[AAI] Service mesh compatibility improvement"