Issue #8265 by tj: Added thumbnail support