Merge "Ensure that the stream feeder doesn't hang in write..." into nyc-dev