Excluding assets, docs and stream
Merge branch 'withknown' into marcus_dev