CON-2255 | fix after merge