Uploading the patch here per elexis' request (https://trac.wildfiregames.com/ticket/2305#comment:40), but still proceeding to work on it.
Current state: the patch works with some network configurations, see details here: https://trac.wildfiregames.com/ticket/2305#comment:39
TODO:
- address the code-review comments (posted here and on Trac: https://trac.wildfiregames.com/ticket/2305#comment:25)