SOS-1869

For master