I actually think the underlying cause is TRUNK-5344, rather than being an issue specific to either the Datafilter module or the FHIR2 module. I’m just hoping I can eliminate an indirect dependency from FHIR2 and eliminate the issue, but I can’t promise that that works.