changes to Trunk-3978NEW(1.8.x)