merge up 3.13.x to 4.0.x#789

DanielBadura merged 16 commits into

4.0.xpatchlevel/event-sourcing:4.0.xfrom

3.13.x-merge-up-into-4.0.xpatchlevel/event-sourcing:3.13.x-merge-up-into-4.0.xCopy head branch name to clipboard