Merge pull request #515 from zhenlineo/4.0-back-pressure

Refactoring the stream observer to use a state machine

Author: zhenlineo