[networking-guide] master: updates from my upstream version (6089567)