Modified events emission

Jira-issue: WP-1175