Merge "Ensure invoking obsolete methods throws errors." into oc-dev