Merge "Correct sensor handle for operation parameter" into oc-dev