Merge "Add options to work in a subdirectory."