SOS-1857

For master