LPS-41725

Backport to 6.2 GA if possible.