Fixed data channel not ready error by deferring own event triggering.
Merge branch 'upstream'