Merge change 23168 into eclair

* changes:
  EventHub: Fix file descriptor leak.