Support discard_original_filename