CON-2058 | Fix after merge