Merge "Merge "docs: fixed typo" into pi-dev am: 9ef8b6521c am: b8a1004a72"