Merge "Add default corpus directory" into main