Merge "Fix revision table cleanup on delete"