LPS-32738

Brian, see commit comments for explanation. Thx