[Bookmark] Backport a bunch of patches from bookmark repo