LPS-36407

Hi Brian,

I split a couple of commits so that you have an easier time understanding and following the changes.

I sent the fix at the end separately but I included it here so it compiles.

Zs.