Merge change 23440 into eclair

* changes:
  allow adding content: bookmarks