LPS-39211

For 6.2.x CE and EE