Merge "Remove the data type from the OperationType enum." into oc-mr1-dev