LPP-11069

Hi Tibor,

Could you check my changes for the issue we talked yesterday? 

If those changes makes sense for you, just tell me and I'll resend the pull request to Marcellus to review the code.

Another thing, Could you create the LPS associated to this issue?

Thanks!!!

Eudaldo.