LPS-40995

Hey Hugo, could you send this to Sergio? This is now an urgent issue for a client. I didn't want to send straight to Sergio because I had to add a lot of changes