LPS-39894

Nate, I visualy reviewed the code. -Byran