Added some yielding to main and receive loops
Merge remote-tracking branch 'upstream/master' into Tamschi/network-rewrite
Merge branch 'Tamschi/network-rewrite'