Merge "Fix thumbnail generation failure"