Merge "Docs: Restructure Section 5.9" into oc-dev