CON-1395 | Changes after CR