LPS-32697

Hey Iliyan, I think I found two inconsistencies in the pull.... can you verify I didn't break anything and if so, send to Nate? thanks!