Preview images now using the same mechanism as attachment files to be saved & edited. The are both referred to as data files.
Merge remote-tracking branch 'origin'