LPS-40252

Nate, I visually reviewed the code.