LPS-48330 SF

In case you are still able to reproduce the original issue, please, send the new pull to Levi.
Unfortunately, I won't have time to review it.

Thanks,
Tibi