LPS-40597

Hey Brian,

This logic has already gone through Sergio. He just told us to fix/add some tests.

I'm sending directly to you because it's for a technical support ticket that is long overdue.