Merge "Fix typo and sphinx doc formatting"