Support network 2.6.* and network-uri

Because of #68, would it be possible to get a maintenance release for `4000.2.16` as well? This commit cherry picks cleanly on top of it.