CON-1548 | Fix after CR