LPS-34965

Hi Tomas,

This is for master branch.

Thanks!