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