Merge branch 'bug/2390-tmpfile-race'