Merge "Fix image fetching." into pi-dev