Merge pull request #5692 from yan12125/fix-embedthumbnailpp