LPS-44616

Heya Rob, can you test out my changes and let me know if you have any issues? If it's all good, go ahead and submit to Brian and just tell him I already reviewed. Thanks Rob\!