LPS-38497

See ticket for explanation. It would be great if we could include this in ee-6.2.x too.