SOS-1411

For master