include of various streams removed from library code
Merge branches 'dev' and 'master'