Merge "Support BOOKMARK_TYPE"