Merge "docs: Javadoc typo fix" into pi-dev