CON-2088 | Fix after CR