Merge "docs: fixing errors found with lint check" into pi-dev