Improve ManagedStreams (#7367)