LPS-44837

I used the fix submitted by the LPS reporter and LPS-45356 for this fix.