Merge "Removed deprecated, hidden method." into oc-dev