Merge branch 'jc/finalize-temp-file'