Merge "Updated AbstractDataModification to also implement DataChange"