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