Added stream deletion handling
Merge branch 'master' into monitorOptimizing