Merge "Don't keep a reference to Service object" into oc-dev