CON-1888: Changes after CR