Upmerge 3.14.1 into 4.0.x#290

DanielBadura merged 2 commits into

4.0.xpatchlevel/event-sourcing-bundle:4.0.xfrom

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