Merge "Adopt new corpus documentation"