Merge change 38 into donut

* changes:
  Fix issue #1769910 (Track activity launch times)