LPS-34440

Hi Eudaldo, can you please check my source formatting to verify I didn't break anything. Thanks\!