CON-2105 | Fix after CR