Merge change 8648 into donut

* changes:
  Use the old string for bookmarks permissions.