Prep MR for !1395

Thomas Braunrequested to merge
feature/make-event-subsciption-faster-and-more-versatile-prep into main

These are the easy parts from !1395 (merged) in a new MR to facilitate faster merging.

Edited by Thomas Braun

Merge request reports