Added patch for conditional fields for assessments