Merge "Restoring old methods for compatibility." into oc-dev