Merge "Use dev/null instead of tmp file"