trunk-3987NEW(1.8.x)

I have modified the changes asked by you.