LPS-51230

Rebased