CON-1680 | Changes after CR (2.5)