Revert "Networking"

This reverts commit df353e4dd922f63c1fb34c25eab745ed0739ce94.
Revert "Revert "Networking""

This reverts commit 73e559861488c5886aabc8c466b9680e3266a7e0.
Merge remote-tracking branch 'origin/master'