SOS-1895

For master