Merge "Add option to set external temp dir"