Merge "Clarify docs a bit" into oc-mr1-dev