Merge "Docs: Restructure section 8.1." into oc-dev