Merge change 24012 into eclair

* changes:
  add a transaction monitor