Merge "Fix ZipUtil, ensure tmpfile is deleted"