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