Merge "Set enum to fixed size type" into oc-mr1-dev