Merge "Deprecate findAddress() method" into oc-dev