[AAI] Service mesh compatibility improvement