Merge change 9000 into donut

* changes:
  Fix duplicate entries being added when application is in active use