CON-1444 | Fix after merge