Avoid potential race condition between close/drain events when piping
Merge branch 'refs/heads/resume-race'