Merge "Make new onFill/onSave methods abstract." into oc-dev