Scaffolded images
Merge