CON-550 | Changes after CR