CON-1785: Changes after CR