Merge "Documentation edits for OOF"