LPS-27530 Staging changes for bookmarks