Merge "Revert "Temporary disable tests failing tests for O""