CON-1700: Changes after CR