Image replace option fix
Merge pull request #6360 from guardian/replace-image-fix

Image replace option fix