CON-972 | Changes after CR