Temporarily comment out changes from 'sort_patient_data_criteria' branch