Added secondary event storage.
Reversion. No need for a second event storage.
Merge remote-tracking branch 'origin/master'