Stream stop

Merging stream_stop down into the master