SOS-1820

For master