Fixed loading of stream JS
Merge branch 'development'