LPS-46524

I asked some questions on the previous pull so feel free to look at that for some more details. Let me know if you have any questions.