CON-307 | Changes after CR