Merge "Fix thumbnail bug"