Lps 33427

I'm afraid commits from 43c8712 to 39d23eb are already reviewed and pushed to master. Tests should be reviewed when @robertoDiaz changes are ready