CON-2343: Changes after CR