LPS-30715

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