SOS-1939

For master