SOS-1861

For master