New changes to the Trunk-2280