Merge "O is 8.0.0 and REL" into oc-dev