LPS-46903 To be done