Apply changes from this PR, https://github.com/anoma/anomapay-backend-multichain/pull/101
Apply changes from this PR, https://github.com/anoma/anomapay-backend-multichain/pull/101