Merge "Generate thumbnails based on buckets"