Merge "Documentation updates" into oc-dev