Merge "docs: bug 37070226, sates typo" into pi-dev