SOS-1867

For master