Merge "Fix flaky test?" into oc-dev