LPS-32582

Hi Vili,

please check my changes and re-test the solution. Once you think it is fine please forward it to Tomcsi.

thanks,
Dani