SOS-1972

For master