Update CommandEventHandler type to use EventHandler
#4740
Merged
CommandEventHandler type to use EventHandler
#4740