Merge pull request #16968 from MHBauer/network-refactor

refactor use of container struct from daemon