Merge "replace delegate with EventHandler"