SOS-1986

For master