Make the original_directory and original_extension optional so that we dont break API

Merged Amir MOHAMMADI requested to merge api into master

Merge request reports