Log Message:
Try to fix a network stream error which has caused Zenicb client unstable.
Patch provided by Martin Hauseman with help from Faried Nawaz, the author.
Should close PR 21620.

While here, merge misplaced patch files.