TRUNK-3094-V1

Please see the changes which I have done.