Merge "Fix AAI connection issues"