Merge change 8873

* changes:
  More precise determination of when to back up the bookmarks