LPS-36674

For 6.2.x and ee-6.2.x