SOS-1965

For master