Add support for placeholder images
Merge branch 'release/1.1.0' into develop