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