Merge "Use correct feature type for watch." into oc-dev