Merge pull request #3682 from basrieter/stream_proxy