support event context stacking

Note: Disregard the first 2 commits on this branch, they are part of another PR

Reviewers: @rocha, @jtauber