SOS-1874

For master