Delete temp file in try/finally
Merge pull request #937 from heidiso/release-24

[Release-24] Delete temp file in try/finally