Hotfix - Fetching images by faust.
Merge branch 'hotfix' into develop