new changes to Trunk-2280