Merge change 21927 into eclair

* changes:
  Improved RS timing code to monitor where we spend CPU time.