Merge "Temporary disable tests failing tests for O" into oc-dev