SOS-1830

For master