LPS-33926

Hi Ray,

we worked last week with @JorgeFerrer to apply the changes you sent in the email. Jorge already reviewed them and we are sending it back to you for final review.

Thank you!