LPS-42820

Hi guys,

\@moltam89

Could you check my changes and test it? If all looks fine for you, tell me and I'll send it to Brian.

Thanks!!!!

Eudaldo