Merged changes from indivo_1_ha branch for HealthRecordTreeView