Merge branch 'stream_2016_dev'