SOS-1955

For master