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