[SJS-148][WIP]: Fix demo incomingStream bugs