Fixes field/file to delete the file after it’s done with it.
Merge branch 'release/2.3'