Merge "Fix AAI simulator"