Feature Flagged as event-dispatcher-toggle-handlers