Merge "Fix broken test" into oc-mr1-dev