SOS-1977

For master