LPS-30715

Hi Vili,

could you review and test my changes of your pull request?

thanks,
Dani