CON-1977: Changes after CR