LPS-39178

Edu, could you please review and test this one? thank you very much! 

I have asked @laszlocsontos to include his use case in the test.

cheers!