SOS-1207

For 6.2.x CE and EE