Set local address a different way to avoid race condition
Merge pull request #2350 from Particular/fix-local-address-override

Set local address a different way to avoid race condition