SOS-1662

For 6.2.x