Merge "FIxed typo." into oc-mr1-dev