fix: [#3484911] Related events fixes