Merge "docs: corrected code example mistakes" into oc-dev