Merge PR #4672: We need to replace trigger system by EventDispatcher in future.

Merge PR #4672: We need to replace trigger system by EventDispatcher in future.