CON-1707: Changes after CR