SOS-2041

For master