Merge branch '3568_image_view_jpeg'