Improved custom streams namespaceing.
Merge branch 'dev'