merged response-streams branch