SOS-1891

For master