SOS-1769

For 6.2.x