SOS-1856

For master