Merge "updated aai version enum"