Error in payment with Credit card 3d Secured and Multicurrency website

Hi,
I have an issue when a payment is made in my website with Credit card and 3D secure. The issue arises when the customer reaches the checkout page with a currency (identified by customer’s IP) but the currency is changed in the checkout page because customer’s currency does not correspond to the country of the customer’s billing address (this may happen because the currency identified starting from the IP is not correct or because the customer is using a VPN).
In this scenario the Merchant account ID used to create the 3D secure request differs from the one used to create the transaction sale request. The payment fails with the following validation error message “Validation Error 91584 – Merchant account must match the 3D Secure authorization merchant account”.
I’ve been already in touch with the author of Aelia currency switcher plugin and this is his feedback:

“To fix the issue, the payment logic must generate the 3D Secure token by taking the currency from the order. If the token must be fetched before the order is created, then the Braintree plugin should refresh the token when the “checkout review” event (the one that triggers the Ajax refresh) is triggered. This will allow to keep the token synchronised with the currency changes, and allow the transaction to be processed correctly.”

Could you please check this logic and fix it?

Thanks in advance

Kindest regards,
Tito