SOS-1819

For master