SOS-1875

For master