Merge "fix service binding" into oc-dev