Merge release 3.16.1 into 4.0.x#312

DavidBadura merged 130 commits into

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

3.16.x-merge-up-into-4.0.x_3l4Fvf70patchlevel/event-sourcing-bundle:3.16.x-merge-up-into-4.0.x_3l4Fvf70Copy head branch name to clipboard