LPS-36216

Hi Brian, there will be another one for this and a third one with the tests, so please don't resolve the ticket until all three is in. Thanks, Zs.