Pass through correctly if stream size is zero
Merge remote-tracking branch 'pump4/master'
Merge remote-tracking branch 'origin/master'