Ticket 31993 Changes to EFT Canada format