CB-4907 Close stream when we're finished with it