Some work on sync/async context execution
Merge pull request #968 from eclipse/context_changes

Some work on sync/async context execution