Merge change 2836

* changes:
  get rid of TimerProbe which is never used