SOS-1953

For master