+per #3661 Event sourcing support
Merge pull request #1766 from eligosource/wip-3661-event-sourcing-krasserm

+per #3661 Event sourcing support
Merge remote-tracking branch: upstream/master