Need to first delete the old thumbnail on disk to prevent duplicates
Merge branch 'thumbnail_fix_pr' into thumbnail_fix_pr_test_new