CON-1809 | Changes after CR