Merge "Allow for specifying the output_dir"