LPS-37851

Backport requested.