Add images to primary
Remove images and add to primary
Merge commit '01ef8408391d7353ba86a37c4e51b6403e069596'