Merge change 23868 into eclair

* changes:
  Add better service reporting.