Merge "[AAI] AAI images update" into kohn