SOS-1731

For 6.2.x