Merge "Add call super" into oc-dev