Request stream improvements

Contains @jchannon 's fixed in #1036 with some additional modifications