Merge change 24320 into eclair

* changes:
  Simplify networking code initialization using static structures instead of code. Fix an uninitialized variable.