Merge branch 't/net_cleanups'