CON-1680 | Changes after CR