Merge pull request #5316 from vgaetera/network-routing