CON-1491 | Fix after merge