Merge "Bookmark drop CAB"