Merge pull request #479 from sortega/port/180_addresses

[Port] Fix race condition on wallet generation