SOS-1959

For master