[1603] port of 1720 and 1689 EventDispatcher fix