Network + teamTis (reverse-merged from commit aa1689b754e53201ecc6dd1cf1f3c5222cd502d8)