Add EventStore EventDispatcher
Merge origin/master