SOS-1700

For 6.2.x CE and EE