slack-15.0: VStreams fix backports/patches, pt. 2

slack-15.0: VStreams fix backports/patches, pt. 2 #2680