Trying to fix a OOM on stream to string
stream size up
Merge remote-tracking branch 'origin/master'