ref: refs/heads/6-sync-images-with-fai
