SOS-1866

For master