SOS-1982

For master