Merge "replace delegate with EventHandler"

No match.