Merge release 3.18.0 into 4.0.x#823

github-actions[bot] wants to merge 22 commits into4.0.xpatchlevel/event-sourcing:4.0.xfrom

3.18.x-merge-up-into-4.0.x_tKMpVMytpatchlevel/event-sourcing:3.18.x-merge-up-into-4.0.x_tKMpVMytCopy head branch name to clipboard