LPS-25224

Hi Zsolt,

Please test and review these changes, and we can discuss further changes.

Thanks,

Máté