Feature requests 2986 and 3083 included. Thumbnail handling per product image (not on catelog images).