SOS-1935

For master