Task#5528 fix stream layout