Merge branch 'stream-sync'

* stream-sync:
  2.0.0
  deprecate
Merge branch 'master' into stream-sync

* master: