LPS-49013 SF

Hi Jorge,

Could you check my changes? If everything works fine, Could you sent to Mate the pull request?

Thanks!!

Eudaldo.