Merge "Fix stream item layout and failing tests"