Merge "Support unbundled bookmarks. Bug #2460685"