updated streams model
Merge branch 'develop'