Trigger events with the correct ID

Alex Pottrequested to merge
issue/entity_usage-3603878:3603878-8.x-2.x into 8.x-2.x

(cherry picked from commit c4a385f8)

Closes #3603878

Merge request reports