Task#5528 fix stream layout
Merge pull request #90 from vigov5/task#5528

Task#5528 fix stream layout