Merge change 1902

* changes:
  Throttle one last user activity call to 1/sec that was missed last time