SOS-1837

For master