use per-agent config for all EFT Canada batch options, #23757, from #14859