SOS-1973

For master