Merge "Docs: Restructure CDD section 8.5." into oc-dev