Merge "[AAI] AAI images update"