SOS-1248

For 6.2.x