SOS-1707

For 6.2.x