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