SOS-1964

For master