Fixed poorly merged StreamLayout SB