SOS-1882

For master