Merge "Fix sideband stream issues"