LPS-34151

Sending to you for additional review since you're the bookmarks lead.