Merge "Fix broken CTS test" into oc-dev