Added a patch to temporary disable stream management until it's fixed