Issue #2349003: Fixes custom events not affecting segments