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