Added patch for conditional fields to use UUID instead of tid.