Merge "update identity to handle new table attributes"