LPS-34286

As per our discussion. Thanks