LPS-41138 6.2.x Backport