Merge release 3.17.1 into 3.18.x#329

DanielBadura merged 3 commits into

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

3.17.x-merge-up-into-3.18.x_zLycyEQBpatchlevel/event-sourcing-bundle:3.17.x-merge-up-into-3.18.x_zLycyEQBCopy head branch name to clipboard