Merge "Upgrade event schema to support delete operation"