[ESCALATION] LPS-35106

Hey Eudaldo. I'm sending this for to review since Ray is on vacation