Merge "docs: fixing several typos, bug 36941887" into pi-dev