-change to new data stream style
-merge conflict
Merge branch 'master' of https://github.com/justinliucs/haflow-components.git