Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev