Merge "Fix braino in enum use." into oc-dev