SOS-1758

For 6.2.x