LPS-34639

Hey Eduardo,

Just as we talked, i'm sending you the branch. Hope you will have more luck then me. :P