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