CON-1662

Is it required after last changes?