TRUNK-3884 Relationships missing for encounter_provider table