SOS-2036

For master