SOS-1884

For master