Merge branch 'image_fetcher' into engine