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