Fixing crash of ACC-Test.
Merge pull request #3703 from dumganhar/iss2087-new-event-dispatcher

Fixing crash of ACC-Test.[ci skip]