SOS-1858

For master