CON-1073 | Changes after CR