Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev