LPS-40352

Nate, I visually reviewed the code.