Merge remote-tracking branch 'kblees/kb/fix-broken-pipe-detection-v2' into devel