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