LPS-46842

Rebased