Fix dump configuration
Fix dump calculation
Merge pull request #1192 from nlegoff/fix-stream

[3.8.6] Some fixes